merge

2011-07-01 12:25:38 -05:00 · 2011-07-01 12:25:38 -05:00 · a5a23c3695
parent 021ce5ccaf 03d22f5366
commit a5a23c3695
1 changed files with 4 additions and 0 deletions
--- 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());
 }