diff options
author | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
commit | af142618f9c18a418bd11ab8eae6c83caa03ddac (patch) | |
tree | fbdfb3f954bf68df568c1dc898b0dc261ad77873 /indra/newview/llviewerobjectlist.h | |
parent | ae2cbe5258ad76e22420be2760379480e10fb72c (diff) | |
parent | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 8e211eaf73..9d1b5cb56f 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -102,9 +102,10 @@ public: F32 restitution, F32 gravity_multiplier); - void updateQuotaCost( const LLUUID& objectId, const SelectionQuota& costs ); + void updateQuota( const LLUUID& objectId, const SelectionQuota& costs ); void shiftObjects(const LLVector3 &offset); + void repartitionObjects(); bool hasMapObjectInRegion(LLViewerRegion* regionp) ; void clearAllMapObjectsInRegion(LLViewerRegion* regionp) ; |