summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-08-17 06:34:28 +0000
committerDon Kjer <don@lindenlab.com>2012-08-17 06:34:28 +0000
commitc188fa6ab7f008069ac5c8d7ae8abc793e7e96f9 (patch)
tree719b2d816149a53c3c331467ff7e63f003a1b8e0 /indra/newview
parent64d9705ae21c42f4c7869a414e250c5de251b143 (diff)
Fix for incorrectly reading extended region flags
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatergodtools.cpp2
-rw-r--r--indra/newview/llfloaterregioninfo.cpp2
-rw-r--r--indra/newview/llregioninfomodel.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index aac8f5bfc1..9c95899c77 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -239,7 +239,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
if (msg->has(_PREHASH_RegionInfo3))
{
- msg->getU64Fast(_PREHASH_RegionInfo3, _PREHASH_RegionFlags, region_flags);
+ msg->getU64Fast(_PREHASH_RegionInfo3, _PREHASH_RegionFlagsExtended, region_flags);
}
else
{
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 1d9f519d70..a179e4dff7 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -348,7 +348,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
if (msg->has(_PREHASH_RegionInfo3))
{
- msg->getU64("RegionInfo", "RegionFlags", region_flags);
+ msg->getU64("RegionInfo", "RegionFlagsExtended", region_flags);
}
else
{
diff --git a/indra/newview/llregioninfomodel.cpp b/indra/newview/llregioninfomodel.cpp
index cc777d9297..498564ecc9 100644
--- a/indra/newview/llregioninfomodel.cpp
+++ b/indra/newview/llregioninfomodel.cpp
@@ -160,7 +160,7 @@ void LLRegionInfoModel::update(LLMessageSystem* msg)
if (msg->has(_PREHASH_RegionInfo3))
{
- msg->getU64Fast(_PREHASH_RegionInfo, _PREHASH_RegionFlags, mRegionFlags);
+ msg->getU64Fast(_PREHASH_RegionInfo, _PREHASH_RegionFlagsExtended, mRegionFlags);
}
else
{