diff --git a/doc/contributions.txt b/doc/contributions.txt
index e4ee2141a82f0d460dab42ec69ad62be267044ae..63a40a1fd2de1b07ea9182b35d10f7602dcc8006 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -678,6 +678,7 @@ Jonathan Yap
 	OPEN-161
 	STORM-1953
 	STORM-1957
+	OPEN-113
 	STORM-1975
 	STORM-1987
 	STORM-1982
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 19cec558373392310f98ab2535e617288b10852d..855836af7ad620af7c76831c8229d1dfd2c7a048 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -535,9 +535,16 @@ BOOL LLFloaterModelPreview::postBuild()
 	mUploadBtn = getChild<LLButton>("ok_btn");
 	mCalculateBtn = getChild<LLButton>("calculate_btn");
 
-	mCalculateBtn->setClickedCallback(boost::bind(&LLFloaterModelPreview::onClickCalculateBtn, this));
+	if (LLConvexDecomposition::getInstance() != NULL)
+	{
+		mCalculateBtn->setClickedCallback(boost::bind(&LLFloaterModelPreview::onClickCalculateBtn, this));
 
-	toggleCalculateButton(true);
+		toggleCalculateButton(true);
+	}
+	else
+	{
+		mCalculateBtn->setEnabled(false);
+	}
 
 	return TRUE;
 }