summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-07-14 11:11:31 -0500
committerDave Parks <davep@lindenlab.com>2010-07-14 11:11:31 -0500
commit13202e744c35f0c6154cd0b582b1834896cacb79 (patch)
tree6a78237dd74c6270201afb6921e34e0b81dcfad5 /indra/newview/llviewerobjectlist.h
parentb46fff1ba1450d14424e676f31c0cacd921bedb0 (diff)
parent2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 706966deae..4064a68eb2 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -91,6 +91,9 @@ public:
void updateApparentAngles(LLAgent &agent);
void update(LLAgent &agent, LLWorld &world);
+ void updateObjectCost(LLViewerObject* object);
+ void updateObjectCost(LLUUID object_id, F32 prim_cost, F32 link_cost);
+
void shiftObjects(const LLVector3 &offset);
void renderObjectsForMap(LLNetMap &netmap);
@@ -192,6 +195,10 @@ protected:
std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
+ //set of objects that need to update their cost
+ std::set<LLUUID> mStaleObjectCost;
+ std::set<LLUUID> mPendingObjectCost;
+
std::vector<LLDebugBeacon> mDebugBeacons;
S32 mCurLazyUpdateIndex;