From 81d1d427f194c969031c334151df0dda231331b8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 11 Dec 2013 10:41:28 -0500
Subject: [PATCH] OPEN-113 Build > Upload > Model > Calculate weights & fee is
not disabled in OS built viewers
---
doc/contributions.txt | 1 +
indra/newview/llfloatermodelpreview.cpp | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f9d0c2c86e..ccc62f890e8 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -674,6 +674,7 @@ Jonathan Yap
OPEN-161
STORM-1953
STORM-1957
+ OPEN-113
Kadah Coba
STORM-1060
STORM-1843
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 19cec558373..1699fb4e8d7 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::isFunctional())
+ {
+ mCalculateBtn->setClickedCallback(boost::bind(&LLFloaterModelPreview::onClickCalculateBtn, this));
- toggleCalculateButton(true);
+ toggleCalculateButton(true);
+ }
+ else
+ {
+ mCalculateBtn->setEnabled(false);
+ }
return TRUE;
}
--
GitLab