summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
commit484a4733b7b361d87c6092f4f399951e84c2aacd (patch)
tree3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/newview/llviewerobjectlist.h
parent3dfb4944ed916f9a251078a2614a854b9de0315d (diff)
parent68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff)
Merge latest from lindenlab/viewer-development/
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 65374bca70..8e211eaf73 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -36,6 +36,7 @@
// project includes
#include "llviewerobject.h"
+#include "llaccountingquota.h"
class LLCamera;
class LLNetMap;
@@ -101,6 +102,8 @@ public:
F32 restitution,
F32 gravity_multiplier);
+ void updateQuotaCost( const LLUUID& objectId, const SelectionQuota& costs );
+
void shiftObjects(const LLVector3 &offset);
bool hasMapObjectInRegion(LLViewerRegion* regionp) ;