Backed out changeset: 87661f6ec809

meow-7.2.2
Rider Linden 2017-03-13 14:47:28 -07:00
parent 988f624f01
commit cee83074e9
3 changed files with 3 additions and 4 deletions

View File

@ -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_RegionDenyAccessOverride = LLMessageStringTable::getInstance()->getString("RegionDenyAccessOverride");
char const* const _PREHASH_RegionAllowAccessOverride = LLMessageStringTable::getInstance()->getString("RegionAllowAccessOverride");
char const* const _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord");
char const* const _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord");

View File

@ -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_RegionDenyAccessOverride;
extern char const* const _PREHASH_RegionAllowAccessOverride;
extern char const* const _PREHASH_UCoord;
extern char const* const _PREHASH_VCoord;
extern char const* const _PREHASH_FaceIndex;

View File

@ -1547,8 +1547,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
if (msg->getNumberOfBlocks(_PREHASH_RegionAllowAccessBlock))
{
msg->getBOOLFast(_PREHASH_RegionAllowAccessBlock, _PREHASH_RegionDenyAccessOverride, region_allow_access_override);
region_allow_access_override = !region_allow_access_override; // flip simhost sends negative...
msg->getBOOLFast(_PREHASH_RegionAllowAccessBlock, _PREHASH_RegionAllowAccessOverride, region_allow_access_override);
}
msg->getS32("ParcelData", "OtherCleanTime", other_clean_time );