diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 16 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index a19e17778a..55c4907a74 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2840,7 +2840,8 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement ) //process children daeTArray< daeSmartRef<daeElement> > children = element->getChildren(); - for (S32 i = 0; i < children.getCount(); i++) + int childCount = children.getCount(); + for (S32 i = 0; i < childCount; i++) { processElement(children[i],badElement); } @@ -3532,6 +3533,12 @@ void LLModelPreview::setPhysicsFromLOD(S32 lod) void LLModelPreview::clearIncompatible(S32 lod) { + //Don't discard models if specified model is the physic rep + if ( lod == LLModel::LOD_PHYSICS ) + { + return; + } + for (U32 i = 0; i <= LLModel::LOD_HIGH; i++) { //clear out any entries that aren't compatible with this model if (i != lod) @@ -3806,7 +3813,7 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim { lod_mode = iface->getFirstSelectedIndex(); } - mRequestedLoDMode[mPreviewLOD] = lod_mode; + mRequestedLoDMode[which_lod] = lod_mode; F32 lod_error_threshold = mFMP->childGetValue("lod_error_threshold_" + lod_name[which_lod]).asReal(); @@ -4247,6 +4254,8 @@ void LLModelPreview::updateStatusMessages() icon = mFMP->getChild<LLIconCtrl>("lod_status_message_icon"); icon->setImage(img); } + + updateLodControls(lod); } @@ -4448,6 +4457,7 @@ void LLModelPreview::updateLodControls(S32 lod) { "lod_mode_", "lod_triangle_limit_", + "lod_error_threshold_" }; const U32 num_lod_controls = sizeof(lod_controls)/sizeof(char*); @@ -5539,8 +5549,6 @@ void LLModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit) if (!mLODFrozen) { genLODs(lod, 3, enforce_tri_limit); - updateLodControls(lod); - updateStatusMessages(); refresh(); } } 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 df4c66c5b6..cae6445b02 100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1296,7 +1296,7 @@ name="warning_title" top_pad="10" text_color="DrYellow" - visible="true" + visible="false" width="40"> NOTE: </text> @@ -1310,7 +1310,7 @@ top_delta="2" wrap="true" width="462" - visible="true"> + visible="false"> You dont have rights to upload mesh models. [[VURL] Find out how] to get certified. </text> </panel> |