diff options
author | prep <prep@lindenlab.com> | 2011-09-08 15:55:17 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2011-09-08 15:55:17 -0400 |
commit | 66aabf8a4f3b0701b677b07215cfc9e01630996d (patch) | |
tree | 7cf3e44c7ab3a0f928af096ede6e46a8cdd97f05 /indra/newview/llpanelobject.cpp | |
parent | 2e652ce660e86097ce2b47bb82926005bb0482c8 (diff) | |
parent | 4e0ba4fc84681e22ec6c8f888f9960f5691ce602 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r-- | indra/newview/llpanelobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |