summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-05-25 09:12:36 -0400
committerLoren Shih <seraph@lindenlab.com>2011-05-25 09:12:36 -0400
commite03f25d51a5840d9d4f29d0ee238ed4b881b8cee (patch)
tree7d8ad6f2fd58abc004388c8174293ee78bb927bd /indra/newview/llviewerobjectlist.h
parentbc0df31d1beaa6eddd48431eb9e42d38d3698673 (diff)
parentcb797532c0bd7ca0ab4caf66c48aa55ec99160a0 (diff)
automated merge mesh-development -> mesh-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) ;