diff options
author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:14:14 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:14:14 -0500 |
commit | 1b7b8aa00ea4329243125a1c53c90115ff7d6bfa (patch) | |
tree | 5ef154c052e043dbc500c034b4d718c5568643d2 /indra/newview/llviewerobjectlist.h | |
parent | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (diff) | |
parent | 6e37ec08f678451a526f34218cb070d117cdf60a (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 7 |
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; |