diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 16:15:54 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 16:15:54 +0300 |
| commit | bb085a45db845a9bfe8aae83ecc7938f618e9ddc (patch) | |
| tree | c899b00ec7fec2d91f9443de4a93eb21b4a38170 /indra/newview/llpanelobject.cpp | |
| parent | aaee960dd3a2d3da51db6b8ba7a6f5b1f414aef5 (diff) | |
| parent | d63b72fb538d4a9dc977eae91d99263355fadef3 (diff) | |
Merge from seth_mesh_dev to paul_mesh_dev
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); } |