diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-05 14:57:19 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-05 14:57:19 -0700 |
| commit | d41f496510a2bc489efb9ae4479a70646eb989b8 (patch) | |
| tree | d11fd42ebdafd26bd76231c3ae56ca22410b2d86 /indra/newview/llpanelobject.cpp | |
| parent | 00dc8b3982cf69dbe69b8c1913e701c37f22eba0 (diff) | |
| parent | eda12bd009d8f71eb82b6e6238335a172d6e5fb0 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
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; |