From ccbc048f64c55030f056d7c4db1ced1538947f49 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 26 Jun 2015 14:59:40 -0700
Subject: [PATCH] repair bad ordering of PROP_SCRIPT_TIMESTAMP

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

diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 9f4cc27cf3..e83a69227f 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -55,7 +55,6 @@ enum EntityPropertyList {
     PROP_DAMPING,
     PROP_LIFETIME,
     PROP_SCRIPT,
-    PROP_SCRIPT_TIMESTAMP,
 
     // these properties are supported by some derived classes
     PROP_COLOR,
@@ -124,6 +123,7 @@ enum EntityPropertyList {
     PROP_DESCRIPTION,
     
     PROP_FACE_CAMERA,
+    PROP_SCRIPT_TIMESTAMP,
     
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties ABOVE this line
diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp
index f989c417f0..5fe9bbbb99 100644
--- a/libraries/networking/src/PacketHeaders.cpp
+++ b/libraries/networking/src/PacketHeaders.cpp
@@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketTypeEntityAdd:
         case PacketTypeEntityEdit:
         case PacketTypeEntityData:
-            return VERSION_ENTITIES_SCRIPT_TIMESTAMP;
+            return VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX;
         case PacketTypeEntityErase:
             return 2;
         case PacketTypeAudioStreamStats:
diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h
index ade4fc8bd9..789675ec00 100644
--- a/libraries/networking/src/PacketHeaders.h
+++ b/libraries/networking/src/PacketHeaders.h
@@ -185,5 +185,6 @@ const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
 const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
 const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
 const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31;
+const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32;
 
 #endif // hifi_PacketHeaders_h