livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for open-113

meow-7.2.2
Oz Linden 2013-12-17 11:16:02 -05:00
parent 2ea9f3d700 97d9eee4ff
commit 9f056c1ddd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -678,6 +678,7 @@ Jonathan Yap
OPEN-161
STORM-1953
STORM-1957
OPEN-113
STORM-1975
STORM-1987
STORM-1982

11
indra/newview/llfloatermodelpreview.cpp
View File

@ -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;
}