summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 17:32:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 17:32:22 -0400
commitcae0915ee612dc1fe966c82ef764535f07f9a3ac (patch)
tree62f1372225b376a72706ffdfeeec370ac6f1f057 /indra
parent3cca342ffb50093f0e84ad96763bf3d7587630ae (diff)
parenta5a23c3695632dbb252fcd88f12ca118fb39bf3d (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerobjectlist.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 45c6777ae8..c772ea32d0 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1395,6 +1395,10 @@ void LLViewerObjectList::updateActive(LLViewerObject *objectp)
void LLViewerObjectList::updateObjectCost(LLViewerObject* object)
{
+ if (!object->isRoot())
+ { //always fetch cost for the parent when fetching cost for children
+ mStaleObjectCost.insert(((LLViewerObject*)object->getParent())->getID());
+ }
mStaleObjectCost.insert(object->getID());
}