SL-13359 #1 Revert floater_tools and object panel changes

1 files changed, 0 insertions, 34 deletions

diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 65f46a8ed3..e9b9254a78 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -37,7 +37,6 @@ class LLCheckBoxCtrl;
 class LLTextBox;
 class LLUICtrl;
 class LLButton;
-class LLMenuButton;
 class LLViewerObject;
 class LLComboBox;
 class LLColorSwatchCtrl;
@@ -73,9 +72,6 @@ public:
     void            onPasteSize();
     void            onCopyRot();
     void            onPasteRot();
-    void            onCopyParams();
-    void            onPasteParams();
-
 	static void 	onCommitParametric(LLUICtrl* ctrl, void* userdata);
 
 
@@ -85,17 +81,6 @@ public:
 	BOOL     		onDropSculpt(LLInventoryItem* item);
 	static void     onCommitSculptType(    LLUICtrl *ctrl, void* userdata);
 
-    bool            pasteCheckMenuItem(const LLSD& userdata);
-    void            pasteDoMenuItem(const LLSD& userdata);
-    bool            pasteEnabletMenuItem(const LLSD& userdata);
-    static bool     isLibraryTexture(LLUUID image_id);
-
-    // Finds copy-enabled texture with specified asset from inventory
-    // This can be performance unfriendly and doesn't warranty that
-    // the texture is original source of asset
-    static LLUUID   getCopyPermInventoryTextureId(LLUUID image_id);
-    static bool     canCopyTexture(LLUUID image_id);
-
 protected:
 	void			getState();
 
@@ -168,16 +153,6 @@ protected:
 	LLSpinCtrl*		mCtrlRotY;
 	LLSpinCtrl*		mCtrlRotZ;
 
-    LLButton        *mBtnCopyPos;
-    LLButton        *mBtnPastePos;
-    LLButton        *mBtnCopySize;
-    LLButton        *mBtnPasteSize;
-    LLButton        *mBtnCopyRot;
-    LLButton        *mBtnPasteRot;
-    LLButton        *mBtnCopyParams;
-    LLButton        *mBtnPasteParams;
-    LLMenuButton    *mBtnPasteMenu;
-
 	LLCheckBoxCtrl	*mCheckLock;
 	LLCheckBoxCtrl	*mCheckPhysics;
 	LLCheckBoxCtrl	*mCheckTemporary;
@@ -206,15 +181,6 @@ protected:
     BOOL            mHasSizeClipboard;
     BOOL            mHasRotClipboard;
 
-    LLSD            mParamsClipboard;
-    LLVolumeParams  mClipboardVolumeParams;
-    BOOL            mHasParamsClipboard;
-    
-    BOOL            mPasteParametric;
-    BOOL            mPasteFlexible;
-    BOOL            mPastePhysics;
-    BOOL            mPasteLight;
-
 	LLPointer<LLViewerObject> mObject;
 	LLPointer<LLViewerObject> mRootObject;
 };