diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-03-13 14:16:37 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-03-13 14:16:37 -0700 |
| commit | 988f624f0100e5e35dcb6766c33bb34f5195407f (patch) | |
| tree | 0c6e64f584b7298399932608454111177d9304fe | |
| parent | 880be86cf2f8d7cb7e948d8a456fd8cf5723b3f2 (diff) | |
MAINT-7196: Revers flag when sent to viewer (to correctly mask when value isn't sent)
| -rw-r--r-- | indra/llmessage/message_prehash.cpp | 2 | ||||
| -rw-r--r-- | indra/llmessage/message_prehash.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp index a551f49250..23555e13aa 100644 --- a/indra/llmessage/message_prehash.cpp +++ b/indra/llmessage/message_prehash.cpp @@ -1373,7 +1373,7 @@ char const* const _PREHASH_TransferInventoryAck = LLMessageStringTable::getInsta char const* const _PREHASH_RegionDenyAgeUnverified = LLMessageStringTable::getInstance()->getString("RegionDenyAgeUnverified"); char const* const _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getString("AgeVerificationBlock"); char const* const _PREHASH_RegionAllowAccessBlock = LLMessageStringTable::getInstance()->getString("RegionAllowAccessBlock"); -char const* const _PREHASH_RegionAllowAccessOverride = LLMessageStringTable::getInstance()->getString("RegionAllowAccessOverride"); +char const* const _PREHASH_RegionDenyAccessOverride = LLMessageStringTable::getInstance()->getString("RegionDenyAccessOverride"); char const* const _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord"); char const* const _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord"); diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index e38ced94eb..3865ced953 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -1373,7 +1373,7 @@ extern char const* const _PREHASH_TransferInventoryAck; extern char const* const _PREHASH_RegionDenyAgeUnverified; extern char const* const _PREHASH_AgeVerificationBlock; extern char const* const _PREHASH_RegionAllowAccessBlock; -extern char const* const _PREHASH_RegionAllowAccessOverride; +extern char const* const _PREHASH_RegionDenyAccessOverride; extern char const* const _PREHASH_UCoord; extern char const* const _PREHASH_VCoord; extern char const* const _PREHASH_FaceIndex; diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index a61181bada..1eded8a0ef 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1547,7 +1547,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use if (msg->getNumberOfBlocks(_PREHASH_RegionAllowAccessBlock)) { - msg->getBOOLFast(_PREHASH_RegionAllowAccessBlock, _PREHASH_RegionAllowAccessOverride, region_allow_access_override); + msg->getBOOLFast(_PREHASH_RegionAllowAccessBlock, _PREHASH_RegionDenyAccessOverride, region_allow_access_override); + region_allow_access_override = !region_allow_access_override; // flip simhost sends negative... } msg->getS32("ParcelData", "OtherCleanTime", other_clean_time ); |