diff options
author | Dave Parks <davep@lindenlab.com> | 2011-07-01 12:25:38 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-07-01 12:25:38 -0500 |
commit | a5a23c3695632dbb252fcd88f12ca118fb39bf3d (patch) | |
tree | e0dff900dcaaf0402cffb55b515822730f6ded7f | |
parent | 021ce5ccaf10e140fe114c586466ccea8ea7dbdf (diff) | |
parent | 03d22f5366ad84e2c3a904dfd843c1274b67e41b (diff) |
merge
-rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
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()); } |