SL-13123 Bind shape matrix orientation warning is misbehaving

3 files changed, 9 insertions, 17 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 98ffd30bc7..f609e8a91a 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -180,7 +180,6 @@ BOOL LLFloaterModelPreview::postBuild()
 
 	childSetCommitCallback("preview_lod_combo", onPreviewLODCommit, this);
 
-	childSetCommitCallback("upload_skin", onUploadSkinCommit, this);
 	childSetCommitCallback("upload_joints", onUploadJointsCommit, this);
 	childSetCommitCallback("lock_scale_if_joint_position", onUploadJointsCommit, this);
 
@@ -331,7 +330,11 @@ void LLFloaterModelPreview::onUploadOptionChecked(LLUICtrl* ctrl)
 	if (mModelPreview)
 	{
 		auto name = ctrl->getName();
-		mModelPreview->mViewOption[name] = !mModelPreview->mViewOption[name];
+        mModelPreview->mViewOption[name] = !mModelPreview->mViewOption[name];
+        mModelPreview->refresh();
+        mModelPreview->resetPreviewTarget();
+        mModelPreview->clearBuffers();
+        mModelPreview->mDirty = true;
 	}
 	toggleCalculateButton(true);
 }
@@ -616,20 +619,6 @@ void LLFloaterModelPreview::onUploadJointsCommit(LLUICtrl*,void* userdata)
 }
 
 //static
-void LLFloaterModelPreview::onUploadSkinCommit(LLUICtrl*,void* userdata)
-{
-	LLFloaterModelPreview *fp =(LLFloaterModelPreview *)userdata;
-
-	if (!fp->mModelPreview)
-	{
-		return;
-	}
-	fp->mModelPreview->refresh();
-	fp->mModelPreview->resetPreviewTarget();
-	fp->mModelPreview->clearBuffers();
-}
-
-//static
 void LLFloaterModelPreview::onPreviewLODCommit(LLUICtrl* ctrl, void* userdata)
 {
 	LLFloaterModelPreview *fp =(LLFloaterModelPreview *)userdata;
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 48b90e9d44..6ecc279365 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -140,7 +140,6 @@ protected:
 	static void		onImportScaleCommit(LLUICtrl*, void*);
 	static void		onPelvisOffsetCommit(LLUICtrl*, void*);
 	static void		onUploadJointsCommit(LLUICtrl*,void*);
-	static void		onUploadSkinCommit(LLUICtrl*,void*);
 
 	static void		onPreviewLODCommit(LLUICtrl*,void*);
 	
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 6de88b318a..dbb2c162a3 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -599,6 +599,10 @@ void LLModelPreview::rebuildUploadData()
                         setLoadState(LLModelLoader::WARNING_BIND_SHAPE_ORIENTATION);
                     }
                 }
+                else if (getLoadState() == LLModelLoader::WARNING_BIND_SHAPE_ORIENTATION)
+                {
+                    setLoadState(LLModelLoader::DONE);
+                }
             }
             instance.mTransform = mat;
             mUploadData.push_back(instance);