1 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index c734b38..ac0b96c 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -77,7 +77,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();
@@ -163,6 +165,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
@@ -172,6 +176,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;