From 769755e30a0f91828fe0d2cfe7b9dbef759a42b4 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 29 Jun 2015 06:20:14 -0700
Subject: [PATCH] recycle PROP_SIMULATOR_ID

---
 libraries/entities/src/EntityItem.cpp        | 2 +-
 libraries/entities/src/EntityPropertyFlags.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 587b822013..a546f252f6 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -607,7 +607,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         // before we try to READ_ENTITY_PROPERTY it 
         bool temp = overwriteLocalData;
         overwriteLocalData = true;
-        READ_ENTITY_PROPERTY(PROP_SIMULATOR_ID, QUuid, updateSimulatorID);
+        READ_ENTITY_PROPERTY(PROP_SIMULATION_OWNER, QUuid, updateSimulatorID);
         overwriteLocalData = temp;
     }
 
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index be4e818a4d..244c541362 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -104,7 +104,7 @@ enum EntityPropertyList {
     PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities
     PROP_MARKETPLACE_ID, // all entities
     PROP_ACCELERATION, // all entities
-    PROP_SIMULATOR_ID, // unused
+    PROP_SIMULATION_OWNER, // formerly known as PROP_SIMULATOR_ID
     PROP_NAME, // all entities
     PROP_COLLISION_SOUND_URL,
     PROP_RESTITUTION,
@@ -124,7 +124,6 @@ enum EntityPropertyList {
     
     PROP_FACE_CAMERA,
     PROP_SCRIPT_TIMESTAMP,
-    PROP_SIMULATION_OWNER,
     
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties ABOVE this line