diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:28:41 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-06 12:28:41 -0800 |
commit | b1035e2713023a606960986d6f1b93cfa7324ae4 (patch) | |
tree | 75acb3209ca7c8fed5ce774339b6f3a2d1b603d5 /indra/newview/llviewerobjectlist.h | |
parent | abcdc25c29d6abf4be6e347aca817f39d4057ac2 (diff) | |
parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 1 |
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); |