From 0e4586a42f754775e27405d0a572ff5962d5a951 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Wed, 7 Sep 2011 20:53:44 +0300 Subject: SH-2371 FIXED "Not allowed to upload message" flashes when uploader dialog comes up - This is a regression bug caused by changeset:20407 --- indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') 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: @@ -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. -- cgit v1.2.3 From f44b44400bf678b71bbbf50b2af7f80e8133a2c3 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Thu, 8 Sep 2011 18:47:37 +0300 Subject: SH-2309 FIXED 'Triangles limit' combo value updating problem. Fixed updating 'Error threshold' spinner control visibility. --- indra/newview/llfloatermodelpreview.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index a19e17778a..7362e56434 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3806,7 +3806,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 +4247,8 @@ void LLModelPreview::updateStatusMessages() icon = mFMP->getChild("lod_status_message_icon"); icon->setImage(img); } + + updateLodControls(lod); } @@ -4448,6 +4450,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 +5542,6 @@ void LLModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit) if (!mLODFrozen) { genLODs(lod, 3, enforce_tri_limit); - updateLodControls(lod); - updateStatusMessages(); refresh(); } } -- cgit v1.2.3 From 2e652ce660e86097ce2b47bb82926005bb0482c8 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 8 Sep 2011 15:54:52 -0400 Subject: Fix for SH-2210 --- indra/newview/llfloatermodelpreview.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index b424ad45fb..42186aa247 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2764,6 +2764,7 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement ) //process children daeTArray< daeSmartRef > children = element->getChildren(); + int childCount = children.getCount(); for (S32 i = 0; i < children.getCount(); i++) { processElement(children[i],badElement); @@ -3456,6 +3457,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) -- cgit v1.2.3 From b56e4cf0e428187c5ed4037b843c05610ed0da2a Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 12 Sep 2011 14:51:22 -0400 Subject: BUILDFIX GCC fixing unused variable --- indra/newview/llfloatermodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 56d1fc49ee..55c4907a74 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2841,7 +2841,7 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement ) //process children daeTArray< daeSmartRef > children = element->getChildren(); int childCount = children.getCount(); - for (S32 i = 0; i < children.getCount(); i++) + for (S32 i = 0; i < childCount; i++) { processElement(children[i],badElement); } -- cgit v1.2.3