Pull merge from viewer-chui

1 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4894d63e13..1107c3ecd1 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -433,7 +433,7 @@ void LLDrawable::makeActive()
 	}
 
 	llassert(isAvatar() || isRoot() || mParent->isActive());
-}
+	}
 
 
 void LLDrawable::makeStatic(BOOL warning_enabled)
@@ -447,7 +447,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
 
 		//drawable became static with active parent, not acceptable
 		llassert(mParent.isNull() || !mParent->isActive() || !warning_enabled);
-		
+
 		LLViewerObject::const_child_list_t& child_list = mVObjp->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 			 iter != child_list.end(); iter++)
@@ -624,9 +624,7 @@ BOOL LLDrawable::updateMove()
 	{
 		return FALSE;
 	}
-
-	makeActive();
-
+	
 	BOOL done;
 
 	if (isState(MOVE_UNDAMPED))
@@ -635,6 +633,7 @@ BOOL LLDrawable::updateMove()
 	}
 	else
 	{
+		makeActive();
 		done = updateMoveDamped();
 	}
 	return done;