1 files changed, 19 insertions, 11 deletions

diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 46725a80e4..7161f51c73 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -37,6 +37,7 @@ class LLCheckBoxCtrl;
 class LLTextBox;
 class LLUICtrl;
 class LLButton;
+class LLMenuButton;
 class LLViewerObject;
 class LLComboBox;
 class LLColorSwatchCtrl;
@@ -66,14 +67,14 @@ public:
 	static void 	onCommitPhantom(		LLUICtrl* ctrl, void* userdata);
 	static void 	onCommitPhysics(		LLUICtrl* ctrl, void* userdata);
 
-    void            onCopyPos(const LLSD& data);
-    void            onPastePos(const LLSD& data);
-    void            onCopySize(const LLSD& data);
-    void            onPasteSize(const LLSD& data);
-    void            onCopyRot(const LLSD& data);
-    void            onPasteRot(const LLSD& data);
-    void            onCopyParams(const LLSD& data);
-    void            onPasteParams(const LLSD& data);
+    void            onCopyPos();
+    void            onPastePos();
+    void            onCopySize();
+    void            onPasteSize();
+    void            onCopyRot();
+    void            onPasteRot();
+    void            onCopyParams();
+    void            onPasteParams();
 
 	static void 	onCommitParametric(LLUICtrl* ctrl, void* userdata);
 
@@ -84,6 +85,11 @@ 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     canCopyTexture(LLUUID image_id);
+
 protected:
 	void			getState();
 
@@ -164,6 +170,7 @@ protected:
     LLButton        *mBtnPasteRot;
     LLButton        *mBtnCopyParams;
     LLButton        *mBtnPasteParams;
+    LLMenuButton    *mBtnPasteMenu;
 
 	LLCheckBoxCtrl	*mCheckLock;
 	LLCheckBoxCtrl	*mCheckPhysics;
@@ -196,9 +203,10 @@ protected:
     LLSD            mParamsClipboard;
     LLVolumeParams  mClipboardVolumeParams;
     BOOL            mHasParamsClipboard;
-    BOOL            mHasFlexiParam;
-    BOOL            mHasSculptParam;
-    BOOL            mHasLightParam;
+    
+    BOOL            mPasteParametric;
+    BOOL            mPastePhysics;
+    BOOL            mPasteLight;
 
 	LLPointer<LLViewerObject> mObject;
 	LLPointer<LLViewerObject> mRootObject;