diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-22 08:52:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-22 08:52:21 -0400 |
| commit | 627bd3c5b998b6a743b7b412235bc5a287dadfc4 (patch) | |
| tree | c5b14803f81a8fb068e2af72807d1cc8dbb0c02f /indra/newview/llviewerobjectlist.h | |
| parent | 4c25b7398b1c1fcdd155f4021a6f63b1bff88cdb (diff) | |
| parent | 2091ce3ae745b15c979e78f853eb0d1777efff18 (diff) | |
merge changes for storm-1607
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 9d1b5cb56f..c5f2a2c1ee 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -36,7 +36,6 @@ // project includes #include "llviewerobject.h" -#include "llaccountingquota.h" class LLCamera; class LLNetMap; @@ -102,8 +101,6 @@ public: F32 restitution, F32 gravity_multiplier); - void updateQuota( const LLUUID& objectId, const SelectionQuota& costs ); - void shiftObjects(const LLVector3 &offset); void repartitionObjects(); |