summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-09-08 18:47:37 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2011-09-08 18:47:37 +0300
commitf44b44400bf678b71bbbf50b2af7f80e8133a2c3 (patch)
treeedb40b07b424de7da7fb8afc6306c2a02510d83b /indra/newview
parent955bcbb95106e9c0c5d8b75c42c32dde52cc0bb6 (diff)
SH-2309 FIXED 'Triangles limit' combo value updating problem.
Fixed updating 'Error threshold' spinner control visibility.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp7
1 files changed, 4 insertions, 3 deletions
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<LLIconCtrl>("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();
}
}