diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
| commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
| tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/newview/llpanelobject.cpp | |
| parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
| parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) | |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index c222bbb191..1f77e7a602 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1112,7 +1112,16 @@ void LLPanelObject::getState( ) if (mCtrlSculptType) { - mCtrlSculptType->setCurrentByIndex(sculpt_stitching); + if (sculpt_stitching == LL_SCULPT_TYPE_NONE) + { + // since 'None' is no longer an option in the combo box + // use 'Plane' as an equivalent sculpt type + mCtrlSculptType->setSelectedByValue(LLSD(LL_SCULPT_TYPE_PLANE), true); + } + else + { + mCtrlSculptType->setSelectedByValue(LLSD(sculpt_stitching), true); + } mCtrlSculptType->setEnabled(editable && !isMesh); } @@ -1749,7 +1758,7 @@ void LLPanelObject::sendSculpt() U8 sculpt_type = 0; if (mCtrlSculptType) - sculpt_type |= mCtrlSculptType->getCurrentIndex(); + sculpt_type |= mCtrlSculptType->getValue().asInteger(); bool enabled = sculpt_type != LL_SCULPT_TYPE_MESH; |