QAR-669 1.20 Viewer RC11

QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d9e8407d44..710cd44a6f 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1986,9 +1986,8 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
 
 	LLCharacter* character = *char_iter;
 
-	// create an instance of this motion (it may or may not already exist)
-	LLKeyframeMotion* motionp = (LLKeyframeMotion*) character->createMotion(asset_uuid);
-
+	// look for an existing instance of this motion
+	LLKeyframeMotion* motionp = (LLKeyframeMotion*) character->findMotion(asset_uuid);
 	if (motionp)
 	{
 		if (0 == status)
@@ -2017,7 +2016,7 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
 				motionp->mAssetStatus = ASSET_FETCH_FAILED;
 			}
 			
-			delete []buffer;
+			delete[] buffer;
 		}
 		else
 		{
@@ -2027,8 +2026,7 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
 	}
 	else
 	{
-		// motionp is NULL
-		llwarns << "Failed to createMotion() for asset UUID " << asset_uuid << llendl;
+		llwarns << "No existing motion for asset data. UUID: " << asset_uuid << llendl;
 	}
 }