SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.

1 files changed, 17 insertions, 3 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index bef2a09e6c..12e0b26fed 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2630,6 +2630,20 @@ void LLMeshRepository::notifyLoadedMeshes()
 void LLMeshRepository::notifySkinInfoReceived(LLMeshSkinInfo& info)

 {

 	mSkinMap[info.mMeshID] = info;

+

+	skin_load_map::iterator iter = mLoadingSkins.find(info.mMeshID);

+	if (iter != mLoadingSkins.end())

+	{

+		for (std::set<LLUUID>::iterator obj_id = iter->second.begin(); obj_id != iter->second.end(); ++obj_id)

+		{

+			LLVOVolume* vobj = (LLVOVolume*) gObjectList.findObject(*obj_id);

+			if (vobj)

+			{

+				vobj->notifyMeshLoaded();

+			}

+		}

+	}

+

 	mLoadingSkins.erase(info.mMeshID);

 }

 

@@ -2745,7 +2759,7 @@ U32 LLMeshRepository::getResourceCost(const LLUUID& mesh_id)
 	return mThread->getResourceCost(mesh_id);

 }

 

-const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id)

+const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj)

 {

 	if (mesh_id.notNull())

 	{

@@ -2759,12 +2773,12 @@ const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id)
 		{

 			LLMutexLock lock(mMeshMutex);

 			//add volume to list of loading meshes

-			std::set<LLUUID>::iterator iter = mLoadingSkins.find(mesh_id);

+			skin_load_map::iterator iter = mLoadingSkins.find(mesh_id);

 			if (iter == mLoadingSkins.end())

 			{ //no request pending for this skin info

-				mLoadingSkins.insert(mesh_id);

 				mPendingSkinRequests.push(mesh_id);

 			}

+			mLoadingSkins[mesh_id].insert(requesting_obj->getID());

 		}

 	}