diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-17 11:16:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-17 11:16:02 -0500 |
| commit | 9f056c1ddd46aeab83677bca81dba7c8bcb51f99 (patch) | |
| tree | c813db72c66707a6c4f3bf2dedeb9b848986448c | |
| parent | 2ea9f3d700b72efa1cd486fa89a749b04415d3c2 (diff) | |
| parent | 97d9eee4ffc56123656abfe46db140bd1acca685 (diff) | |
merge changes for open-113
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e4ee2141a8..63a40a1fd2 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 19cec55837..855836af7a 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; } |