summaryrefslogtreecommitdiff
path: root/indra/newview/llregioninfomodel.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
committerCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
commit2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (patch)
treeec40f2091563c690e06fb16d54b84d0e65bef39a /indra/newview/llregioninfomodel.h
parent8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (diff)
parent5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (diff)
Automated merge with tip of viewer64 (after it was merged with viewer-release)
Diffstat (limited to 'indra/newview/llregioninfomodel.h')
-rw-r--r--indra/newview/llregioninfomodel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h
index ea9640efda..baeff82fef 100644
--- a/indra/newview/llregioninfomodel.h
+++ b/indra/newview/llregioninfomodel.h
@@ -53,6 +53,8 @@ public:
U8 mSimAccess;
U8 mAgentLimit;
+ S32 mHardAgentLimit;
+
U64 mRegionFlags;
U32 mEstateID;
U32 mParentEstateID;