summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-02 17:56:35 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-02 17:56:35 -0700
commit3b39ec165aa837d02bf1bf57ff8f3aab3229659c (patch)
treefd718fca322b7c4419a3eaee4a6940f54f8bd659 /indra/newview/llviewerobjectlist.h
parent6e2b3527cc95b92bf136b65fd2ee344d4c879faa (diff)
parent1f305e8624e130683fc5d8fceac7a8159515376b (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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);