diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 17:49:41 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 17:49:41 -0400 |
| commit | 187a39885c89da4975e636760afbc0003df39395 (patch) | |
| tree | fc8b8369e58c7cd764190317caff47fb42020923 | |
| parent | 6160f12bce6ad4d20676c58af98e48577dc2d45f (diff) | |
| parent | 2aa385aeaf7ff57e19278f27fcf4c6a23f97ea30 (diff) | |
merge
| -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 { |