summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
commit8d9aec9278f2113e239a32e393aeca7eefd64fbf (patch)
treec50dfd9859aa0fad2f7aff6574c32587dcce3045 /indra/newview/llviewerobjectlist.h
parent50615ba69c94441c99f21f861cf0290972162998 (diff)
parent0a21efc7abc62511d1ea789bdb47309a6ed1d72e (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 9936432a71..449a4633ff 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -129,6 +129,7 @@ public:
LLViewerObject *getSelectedObject(const U32 object_id);
inline S32 getNumObjects() { return (S32) mObjects.size(); }
+ inline S32 getNumActiveObjects() { return (S32) mActiveObjects.size(); }
void addToMap(LLViewerObject *objectp);
void removeFromMap(LLViewerObject *objectp);