diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-27 13:56:03 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-27 13:56:03 -0500 |
| commit | cd46f4a7b9a71f655c8823162b61024f30a94b3f (patch) | |
| tree | 3d26a0f60764edb663485221702aa1f75b8c2ef6 | |
| parent | 17b21fc197f162a4070083c436920c0640431568 (diff) | |
SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english language
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 9122e5a8f5..7448f2bb2a 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -4525,7 +4525,17 @@ void LLModelPreview::updateStatusMessages() } } - if (mFMP->childGetValue("physics_lod_combo").asString() == "From file") + + LLCtrlSelectionInterface* iface = fmp->childGetSelectionInterface("physics_lod_combo"); + S32 which_mode = 0; + S32 file_mode = 1; + if (iface) + { + which_mode = iface->getFirstSelectedIndex(); + file_mode = iface->getItemCount() - 1; + } + + if (which_mode == file_mode) { mFMP->childEnable("physics_file"); mFMP->childEnable("physics_browse"); |