From c70a357a274d5acd7921c3185dc34b89069d4e61 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 10 Aug 2011 18:59:10 +0300 Subject: SH-2076 FIXED Removed the sculpt type 'None' from edit dialog. If a prim's sculpt type was set to 'None' it is displayed as 'Plane' in the combo box. --- indra/newview/llpanelobject.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelobject.cpp') diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index c222bbb191..e4b2396bc6 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->setCurrentByID(LLSD(LL_SCULPT_TYPE_PLANE)); + } + else + { + mCtrlSculptType->setCurrentByID(LLSD(sculpt_stitching)); + } 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; -- cgit v1.2.3 From d63b72fb538d4a9dc977eae91d99263355fadef3 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Mon, 5 Sep 2011 20:38:17 +0300 Subject: SH-2347 FIXED selecting the value in Stitching Type drop down. --- indra/newview/llpanelobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelobject.cpp') diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index e4b2396bc6..1f77e7a602 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1116,11 +1116,11 @@ void LLPanelObject::getState( ) { // since 'None' is no longer an option in the combo box // use 'Plane' as an equivalent sculpt type - mCtrlSculptType->setCurrentByID(LLSD(LL_SCULPT_TYPE_PLANE)); + mCtrlSculptType->setSelectedByValue(LLSD(LL_SCULPT_TYPE_PLANE), true); } else { - mCtrlSculptType->setCurrentByID(LLSD(sculpt_stitching)); + mCtrlSculptType->setSelectedByValue(LLSD(sculpt_stitching), true); } mCtrlSculptType->setEnabled(editable && !isMesh); } -- cgit v1.2.3