diff options
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 770f10e2ee..2d57d89a44 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -47,7 +47,6 @@ 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. // @@ -114,8 +113,6 @@ public: LLRender::eTexIndex getTextureChannelToEdit(); - void pasteFace(LLViewerObject* object, S32 te); - protected: void getState(); @@ -208,14 +205,10 @@ protected: static void onClickAutoFix(void*); static void onAlignTexture(void*); - void onCopyFaces(); - void onPasteFaces(); - bool pasteCheckMenuItem(const LLSD& userdata); - void pasteDoMenuItem(const LLSD& userdata); - bool pasteEnabletMenuItem(const LLSD& userdata); - static F32 valueGlow(LLViewerObject* object, S32 face); + + private: bool isAlpha() { return mIsAlpha; } @@ -241,22 +234,6 @@ private: F32 getCurrentShinyOffsetU(); F32 getCurrentShinyOffsetV(); - LLButton *mBtnCopyFaces; - LLButton *mBtnPasteFaces; - LLMenuButton *mBtnPasteMenu; - - LLSD mClipboard; - BOOL mPasteColor; - BOOL mPasteAlpha; - BOOL mPasteGlow; - BOOL mPasteDiffuse; - BOOL mPasteNormal; - BOOL mPasteSpecular; - BOOL mPasteMapping; - BOOL mPasteMedia; - - BOOL mPopulateAllTEs; - // Update visibility of controls to match current UI mode // (e.g. materials vs media editing) // @@ -520,8 +497,6 @@ public: DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID); DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID); DEF_EDIT_MAT_STATE(LLColor4U, const LLColor4U&,setSpecularLightColor); - - DEF_EDIT_MAT_STATE(LLSD, const LLSD&, fromLLSD); }; class LLSelectedTE |