Merge branch 'master' into DRTVWR-539

1 files changed, 24 insertions, 2 deletions

diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 2d57d89a44..e3b925c1d4 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -47,6 +47,7 @@ class LLUICtrl;
 class LLViewerObject;
 class LLFloater;
 class LLMaterialID;
+class LLMenuButton;
 
 // Represents an edit for use in replicating the op across one or more materials in the selection set.
 //
@@ -96,6 +97,8 @@ public:
 	LLPanelFace();
 	virtual ~LLPanelFace();
 
+    void draw();
+
 	void			refresh();
 	void			setMediaURL(const std::string& url);
 	void			setMediaType(const std::string& mime_type);
@@ -128,6 +131,8 @@ protected:
 	void			sendMedia();
     void            alignTestureLayer();
 
+    void            updateCopyTexButton();
+
 	// this function is to return TRUE if the drag should succeed.
 	static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item);
 
@@ -205,6 +210,18 @@ protected:
 	static void		onClickAutoFix(void*);
     static void		onAlignTexture(void*);
 
+public: // needs to be accessible to selection manager
+    void            onCopyColor(); // records all selected faces
+    void            onPasteColor(); // to specific face
+    void            onPasteColor(LLViewerObject* objectp, S32 te); // to specific face
+    void            onCopyTexture();
+    void            onPasteTexture();
+    void            onPasteTexture(LLViewerObject* objectp, S32 te);
+
+protected:
+    void            menuDoToSelected(const LLSD& userdata);
+    bool            menuEnableItem(const LLSD& userdata);
+
 	static F32     valueGlow(LLViewerObject* object, S32 face);
 
 	
@@ -400,7 +417,10 @@ private:
 	 * If agent selects texture which is not allowed to be applied for the currently selected object,
 	 * all controls of the floater texture picker which allow to apply the texture will be disabled.
 	 */
-	void onTextureSelectionChanged(LLInventoryItem* itemp);
+    void onTextureSelectionChanged(LLInventoryItem* itemp);
+
+    LLMenuButton*   mMenuClipboardColor;
+    LLMenuButton*   mMenuClipboardTexture;
 
 	bool mIsAlpha;
 	
@@ -415,7 +435,9 @@ private:
 	 * up-arrow on a spinner, and avoids running afoul of its throttle.
 	 */
 	bool mUpdateInFlight;
-	bool mUpdatePending;
+    bool mUpdatePending;
+
+    LLSD            mClipboardParams;
 
 public:
 	#if defined(DEF_GET_MAT_STATE)