summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-05 13:15:58 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-05 13:15:58 -0400
commitd8d1587d49e0fdc45c9f9d42f63870255dd36637 (patch)
tree549205806e9cee829ac39077d411f928e1c69ecd /indra/newview/llviewerobjectlist.cpp
parentd2fe45b8778ffbc67a2c6ec53704de6c95e7b0b3 (diff)
parentec402fad16a937a39f4b5df4fd9da12acd61d322 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-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());
}