summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-30 13:55:53 -0400
committerOz Linden <oz@lindenlab.com>2012-05-30 13:55:53 -0400
commitf09bd7669fcf976edf82c3ce70b26ea044019c67 (patch)
treebfce61c5c323daad6c9ffd20c33e62678b15f3eb /indra/newview/llworld.h
parent589218ecd65af1e1027ffe717ed607493a5c2ca7 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
merge up to 3.3.2-release
Diffstat (limited to 'indra/newview/llworld.h')
-rw-r--r--indra/newview/llworld.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
index d8ab4bc508..f350009d10 100644
--- a/indra/newview/llworld.h
+++ b/indra/newview/llworld.h
@@ -157,6 +157,11 @@ public:
std::vector<LLVector3d>* positions = NULL,
const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const;
+ // Returns 'true' if the region is in mRegionList,
+ // 'false' if the region has been removed due to region change
+ // or if the circuit to this simulator had been lost.
+ bool isRegionListed(const LLViewerRegion* region) const;
+
private:
region_list_t mActiveRegionList;
region_list_t mRegionList;