diff options
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llvovolume.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index b31fa620fe..e4046b06aa 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -4954,12 +4954,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 && isLegacyRigValid() ) { fmp->enableViewOption("show_skin_weight"); fmp->setViewOptionEnabled("show_joint_positions", skin_weight); + mFMP->childEnable("upload_skin"); } - mFMP->childEnable("upload_skin"); } else { @@ -5066,7 +5066,7 @@ BOOL LLModelPreview::render() if (!mModel[mPreviewLOD].empty()) { - mFMP->childEnable("reset_btn");
+ mFMP->childEnable("reset_btn"); bool regen = mVertexBuffer[mPreviewLOD].empty(); if (!regen) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 380d63c77b..380d63c77b 100644..100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index cae6445b02..2eea286c8b 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -27,8 +27,6 @@ <string name="simplifying">Simplifying...</string> <string name="tbd">TBD</string> - <text text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text> - <panel follows="top|left" height="455" @@ -1313,6 +1311,8 @@ visible="false"> You dont have rights to upload mesh models. [[VURL] Find out how] to get certified. </text> + <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text> + </panel> </panel> |