From fca06d9d3daaceda5e38ef24b13d2db9a654eef3 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 19 Jun 2015 09:36:06 -0700
Subject: [PATCH] add actionData to properties that EntityItem transmits and
 receives

---
 libraries/entities/src/EntityItem.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index f834e5f9fa..919244200f 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -122,7 +122,8 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_SIMULATOR_ID;
     requestedProperties += PROP_HREF;
     requestedProperties += PROP_DESCRIPTION;
-    
+    requestedProperties += PROP_ACTION_DATA;
+
     return requestedProperties;
 }
 
@@ -922,6 +923,7 @@ EntityItemProperties EntityItem::getProperties() const {
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(description, getDescription);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(actionData, getActionData);
 
     properties._defaultSettings = false;
     
@@ -982,6 +984,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(name, setName);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(href, setHref);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(description, setDescription);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(actionData, setActionData);
 
     if (somethingChanged) {
         uint64_t now = usecTimestampNow();
@@ -1398,10 +1401,15 @@ void EntityItem::clearActions(EntitySimulation* simulation) {
 }
 
 void EntityItem::setActionData(QByteArray actionData) {
+    if (actionData.size() == 0) {
+        return;
+    }
     QVector<QByteArray> serializedActions;
     QDataStream ds(actionData);
     ds >> serializedActions;
 
+    qDebug() << "EntityItem::setActionData" << actionData.size() << "bytes";
+
     foreach(QByteArray serializedAction, serializedActions) {
         QDataStream dsForAction(serializedAction);
         EntityActionType actionType;
@@ -1438,6 +1446,7 @@ const QByteArray EntityItem::getActionData() const {
         EntityActionPointer action = _objectActions[id];
         QByteArray bytesForAction = action->serialize();
         serializedActions << bytesForAction;
+        i++;
     }
 
     QByteArray result;