diff options
| author | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
| commit | df353a6746f6261ac238d29a418962bbab62ec5b (patch) | |
| tree | 113a11702c5de5fa0e9097f3129927b249aa2781 /indra/newview/llviewerobject.cpp | |
| parent | ef6e51db22ad3aec42b19bcf3e077ff000ba8929 (diff) | |
| parent | 575c7f85b20fca57fcd97a2a18bd7ad0c030a935 (diff) | |
Merge with 8582496d7733948e19396167df9b4d2d4cd35f0c
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 34c73ee739..f5946dfbff 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -100,7 +100,6 @@ #include "lltrans.h" #include "llsdutil.h" #include "llmediaentry.h" -#include "llaccountingquota.h" //#define DEBUG_UPDATE_TYPE @@ -5799,9 +5798,3 @@ public: LLHTTPRegistration<ObjectPhysicsProperties> gHTTPRegistrationObjectPhysicsProperties("/message/ObjectPhysicsProperties"); - -void LLViewerObject::updateQuota( const SelectionQuota& quota ) -{ - //update quotas - mSelectionQuota = quota; -} |