diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
commit | 402a2de7651105d63693deb2872dd6646dd1bd85 (patch) | |
tree | 5b0935f876e954a024227355c34a2c23eebe1b8d /indra/newview/llviewerobjectlist.h | |
parent | 60d15f78e17a2203d73d58c3f1c2af941d599277 (diff) | |
parent | 6b70273603e4aa807662c301179d05a1f2f5a224 (diff) |
merging latest viewer-mesh into nyx's sidebranch
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(); |