summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-09-28 17:06:53 -0700
committerRider Linden <rider@lindenlab.com>2015-09-28 17:06:53 -0700
commit83836d91178235e5c188020ac57c9a296343e83b (patch)
tree7d78228fe71615712fa2e5c133b6bc89609c02db /indra/newview/llviewerobjectlist.h
parentcf6c07927d70db9976d2c47bb21552ba9b38c9b0 (diff)
MAINT-5676: Cleaned up the way we were keeping track of outstanding object cost requests.
MAINT-5626: Fixed a typo/transcription error/fat finger mistake where I was missing the report of the land impact of selected objects.
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rwxr-xr-xindra/newview/llviewerobjectlist.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 9ec7c4bc22..94c751acc6 100755
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -205,17 +205,17 @@ protected:
vobj_list_t mMapObjects;
- std::set<LLUUID> mDeadObjects;
+ uuid_set_t mDeadObjects;
std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
//set of objects that need to update their cost
- std::set<LLUUID> mStaleObjectCost;
- std::set<LLUUID> mPendingObjectCost;
+ uuid_set_t mStaleObjectCost;
+ uuid_set_t mPendingObjectCost;
//set of objects that need to update their physics flags
- std::set<LLUUID> mStalePhysicsFlags;
- std::set<LLUUID> mPendingPhysicsFlags;
+ uuid_set_t mStalePhysicsFlags;
+ uuid_set_t mPendingPhysicsFlags;
std::vector<LLDebugBeacon> mDebugBeacons;