diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /indra/newview/llviewerregion.h | |
parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r-- | indra/newview/llviewerregion.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 038c831e59..8b71998f60 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -73,6 +73,7 @@ public: { PARTITION_HUD=0, PARTITION_TERRAIN, + PARTITION_VOIDWATER, PARTITION_WATER, PARTITION_TREE, PARTITION_PARTICLE, @@ -228,6 +229,11 @@ public: void setCapability(const std::string& name, const std::string& url); // implements LLCapabilityProvider virtual std::string getCapability(const std::string& name) const; + + // has region received its final (not seed) capability list? + bool capabilitiesReceived() const; + void setCapabilitiesReceived(bool received); + static bool isSpecialCapabilityName(const std::string &name); void logActiveCapabilities() const; @@ -407,6 +413,7 @@ private: private: bool mAlive; // can become false if circuit disconnects + bool mCapabilitiesReceived; //spatial partitions for objects in this region std::vector<LLSpatialPartition*> mObjectPartition; |