summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorseth_productengine <none@none>2011-08-08 15:43:00 +0300
committerseth_productengine <none@none>2011-08-08 15:43:00 +0300
commitdf353a6746f6261ac238d29a418962bbab62ec5b (patch)
tree113a11702c5de5fa0e9097f3129927b249aa2781 /indra/newview/llviewerobjectlist.h
parentef6e51db22ad3aec42b19bcf3e077ff000ba8929 (diff)
parent575c7f85b20fca57fcd97a2a18bd7ad0c030a935 (diff)
Merge with 8582496d7733948e19396167df9b4d2d4cd35f0c
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h3
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();