diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
| commit | 029130bf9c76139fa836117987b60e801ac7ec7c (patch) | |
| tree | ee320f7737ad3edc74a2401b5bd20a027b670487 /indra/newview/llpanelobject.h | |
| parent | 0aac2f674e4bd2fc73025ec8b649739cf7be3e4c (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 07b65b6372..8c1bea0108 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -23,6 +23,9 @@ class LLViewerObject; class LLComboBox; class LLPanelInventory; class LLColorSwatchCtrl; +class LLTextureCtrl; +class LLInventoryItem; +class LLUUID; class LLPanelObject : public LLPanel { @@ -50,6 +53,11 @@ public: static void onCommitParametric(LLUICtrl* ctrl, void* userdata); static void onCommitMaterial( LLUICtrl* ctrl, void* userdata); + + 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); protected: void getState(); @@ -61,7 +69,8 @@ protected: void sendIsTemporary(); void sendIsPhantom(); void sendCastShadows(); - + void sendSculpt(); + void getVolumeParams(LLVolumeParams& volume_params); protected: @@ -133,12 +142,16 @@ protected: LLCheckBoxCtrl *mCheckPhantom; LLCheckBoxCtrl *mCheckCastShadows; + LLTextureCtrl *mCtrlSculptTexture; + LLVector3 mCurEulerDegrees; // to avoid sending rotation when not changed BOOL mIsPhysical; // to avoid sending "physical" when not changed BOOL mIsTemporary; // to avoid sending "temporary" when not changed BOOL mIsPhantom; // to avoid sending "phantom" when not changed BOOL mCastShadows; // to avoid sending "cast shadows" when not changed S32 mSelectedType; // So we know what selected type we last were + + LLUUID mSculptTextureRevert; // so we can revert the sculpt texture on cancel LLPointer<LLViewerObject> mObject; LLPointer<LLViewerObject> mRootObject; |