From a766e26db46c7c054bae1021470dbe365f2a3cb3 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Mon, 10 Sep 2012 10:37:02 -0700
Subject: Backing out the changes contributing to DRTVWR-167 and DRTVWR-179
 from the repository.

---
 indra/newview/llviewerobjectlist.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/llviewerobjectlist.h')

diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 9936432a71..64925f46ae 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -118,9 +118,7 @@ public:
 
 	void dirtyAllObjectInventory();
 
-	void removeFromActiveList(LLViewerObject* objectp);
 	void updateActive(LLViewerObject *objectp);
-	
 	void updateAvatarVisibility();
 
 	// Selection related stuff
@@ -199,7 +197,7 @@ protected:
 	typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t;
 
 	vobj_list_t mObjects;
-	std::vector<LLPointer<LLViewerObject> > mActiveObjects;
+	std::set<LLPointer<LLViewerObject> > mActiveObjects;
 
 	vobj_list_t mMapObjects;
 
-- 
cgit v1.2.3


From b4c8a982fc863debe28407d4cc3519b111309725 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 20 Sep 2012 10:00:53 -0400
Subject: reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in
 LLViewerObjectList::update, fix for error in llpolymorph

---
 indra/newview/llviewerobjectlist.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobjectlist.h')

diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 64925f46ae..9936432a71 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
@@ -197,7 +199,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;
 
-- 
cgit v1.2.3


From 44a024d2f5d4467372d0d2082a83449696b22948 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 31 Oct 2012 16:00:56 -0500
Subject: MAINT-646 Fix for leak introduced by optimizations.

---
 indra/newview/llviewerobjectlist.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llviewerobjectlist.h')

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);
-- 
cgit v1.2.3