summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
committerDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
commit99dc246ac843114f20f7aa99531451fcf46df3ed (patch)
treed94a0a31e00c53ea359d9939d1928180d398b334 /indra/newview/llviewerobjectlist.h
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
parentd76715776bb9e26577c4e505745eb2773e8a4796 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index c5f2a2c1ee..336fc3cf20 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -118,7 +118,9 @@ public:
void dirtyAllObjectInventory();
+ void removeFromActiveList(LLViewerObject* objectp);
void updateActive(LLViewerObject *objectp);
+
void updateAvatarVisibility();
// Selection related stuff
@@ -195,7 +197,7 @@ protected:
typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t;
vobj_list_t mObjects;
- std::set<LLPointer<LLViewerObject> > mActiveObjects;
+ std::vector<LLPointer<LLViewerObject> > mActiveObjects;
vobj_list_t mMapObjects;