diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
| commit | 7ffa6ba854392d5c37de8631c7f35edeed375a58 (patch) | |
| tree | 8ca3d2ff39b8ec870ebdf264bf7a26a67f7df624 /indra/newview/llviewerobjectlist.h | |
| parent | ba60e0906549840b8632d72f17b3f9bcda65e882 (diff) | |
| parent | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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(); |