diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llpanelobject.h | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 8c1bea0108..0aab79515b 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -57,7 +57,9 @@ public: static void onCommitSculpt( LLUICtrl* ctrl, void* userdata); static void onCancelSculpt( LLUICtrl* ctrl, void* userdata); static void onSelectSculpt( LLUICtrl* ctrl, void* userdata); - static BOOL onDropSculpt(LLUICtrl* ctrl, LLInventoryItem* item, void* ud); + static BOOL onDropSculpt( LLUICtrl* ctrl, LLInventoryItem* item, void* ud); + static void onCommitSculptType( LLUICtrl *ctrl, void* userdata); + protected: void getState(); @@ -143,6 +145,8 @@ protected: LLCheckBoxCtrl *mCheckCastShadows; LLTextureCtrl *mCtrlSculptTexture; + LLTextBox *mLabelSculptType; + LLComboBox *mCtrlSculptType; LLVector3 mCurEulerDegrees; // to avoid sending rotation when not changed BOOL mIsPhysical; // to avoid sending "physical" when not changed @@ -152,6 +156,7 @@ protected: S32 mSelectedType; // So we know what selected type we last were LLUUID mSculptTextureRevert; // so we can revert the sculpt texture on cancel + U8 mSculptTypeRevert; // so we can revert the sculpt type on cancel LLPointer<LLViewerObject> mObject; LLPointer<LLViewerObject> mRootObject; |