diff options
| author | prep linden <prep@lindenlab.com> | 2011-09-16 15:10:58 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-09-16 15:10:58 -0400 |
| commit | 1a7e1661040c9295c405e72e361307109514fc9b (patch) | |
| tree | 9c1b6bcb2b4a531156b518985b6ac3165abe5f40 /indra | |
| parent | 4b269f67ea8d053b4c05a9c002811901c8ec8a49 (diff) | |
Fix for sh-2443
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 9 |
1 files 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 { |