From 1a7e1661040c9295c405e72e361307109514fc9b Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 16 Sep 2011 15:10:58 -0400
Subject: Fix for sh-2443

---
 indra/newview/llfloatermodelpreview.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 75e775072b..6bba430425 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -4351,6 +4351,11 @@ void LLModelPreview::updateStatusMessages()
 		{
 			skinAndRigOk = false;
 		}	
+		else
+		if ( !getRigWithSceneParity() )
+		{
+			mFMP->childDisable("calculate_btn");
+		}
 	}
 	
 	if(upload_ok && mModelLoader)
@@ -4954,12 +4959,12 @@ BOOL LLModelPreview::render()
 
 	if (has_skin_weights)
 	{ //model has skin weights, enable view options for skin weights and joint positions
-		if (fmp)
+		if (fmp && getRigWithSceneParity() )
 		{
 			fmp->enableViewOption("show_skin_weight");
 			fmp->setViewOptionEnabled("show_joint_positions", skin_weight);	
+			mFMP->childEnable("upload_skin");
 		}
-		mFMP->childEnable("upload_skin");
 	}
 	else
 	{
-- 
cgit v1.2.3