diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
| commit | 9ed7cc297a7e5b0bb912fea26491b3dd6ee90814 (patch) | |
| tree | a7885484c66690879ae0b4ab1e37ba4965303bc4 /indra/newview/llpanelobject.cpp | |
| parent | bc400605cab6f353ab4b952a1056c6c22784d4d9 (diff) | |
| parent | af8864c49c4f9ca9421e3b259e8f51f0469ab7ce (diff) | |
merging in latest mesh-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..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; |