From 75509b9ecb99705fee8d69aef26cd2d8a260ab33 Mon Sep 17 00:00:00 2001 From: Nissim Hadar Date: Tue, 3 Oct 2017 21:39:41 -0700 Subject: [PATCH] WIP - working on byte order in server messages. --- libraries/entities/src/ZoneEntityItem.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 1619816215..cebad4e774 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -210,13 +210,15 @@ EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& p withReadLock([&] { requestedProperties += _skyboxProperties.getEntityProperties(params); }); - withReadLock([&] { - requestedProperties += _hazeProperties.getEntityProperties(params); - }); requestedProperties += PROP_FLYING_ALLOWED; requestedProperties += PROP_GHOSTING_ALLOWED; requestedProperties += PROP_FILTER_URL; + requestedProperties += PROP_HAZE_MODE; + withReadLock([&] { + requestedProperties += _hazeProperties.getEntityProperties(params); + }); + return requestedProperties; }