summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
committerOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
commit8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch)
tree040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/newview/llviewerobjectlist.cpp
parent68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff)
parent361384ebb9f41dbccbaab779a085edb773f0a734 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index acacf63a1f..7873cd7373 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1417,6 +1417,15 @@ void LLViewerObjectList::onObjectCostFetchFailure(const LLUUID& object_id)
mPendingObjectCost.erase(object_id);
}
+void LLViewerObjectList::updateQuotaCost( const LLUUID& objectId, const SelectionQuota& quota )
+{
+ LLViewerObject* pVO = findObject( objectId );
+ if ( pVO )
+ {
+ //pVO->updateQuota( quota );
+ }
+}
+
void LLViewerObjectList::updatePhysicsFlags(const LLViewerObject* object)
{
mStalePhysicsFlags.insert(object->getID());