merge

1 files changed, 15 insertions, 7 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 1e87e84eb2..73707ad2f1 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3402,23 +3402,31 @@ BOOL LLModelPreview::render()
 
 		if (!avatar_preview)
 		{
-			for (LLModelLoader::scene::iterator iter = mScene[mPreviewLOD].begin(); iter != mScene[mPreviewLOD].end(); ++iter)
+			//for (LLModelLoader::scene::iterator iter = mScene[mPreviewLOD].begin(); iter != mScene[mPreviewLOD].end(); ++iter)
+			for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
 			{
+				LLModelInstance& instance = *iter;
+
 				gGL.pushMatrix();
-				LLMatrix4 mat = iter->first;
+				LLMatrix4 mat = instance.mTransform;
 
 				glMultMatrixf((GLfloat*) mat.mMatrix);				
 				
-				for (LLModelLoader::model_instance_list::iterator model_iter = iter->second.begin(); model_iter != iter->second.end(); ++model_iter)
+				//for (LLModelLoader::model_instance_list::iterator model_iter = iter->second.begin(); model_iter != iter->second.end(); ++model_iter)
 				{
-					LLModelInstance& instance = *model_iter;
-					LLModel* model = instance.mModel;
+					//LLModelInstance& instance = *model_iter;
+					LLModel* model = instance.mLOD[mPreviewLOD];
 
-					if (instance.mTransform != mat)
+					if (!model)
 					{
-						llerrs << "WTF?" << llendl;
+						continue;
 					}
 
+					//if (instance.mTransform != mat)
+					//{
+					//	llerrs << "WTF?" << llendl;
+					//}
+
 					if (render_mesh)
 					{
 						for (U32 i = 0; i < mVertexBuffer[mPreviewLOD][model].size(); ++i)