diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-01-29 21:19:58 -0600 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-01-29 21:19:58 -0600 |
| commit | 1751c965ba1ffd1a89a3b94542624e70cbde1060 (patch) | |
| tree | 6bbcb7f9686865afc85590ae6996e78148189274 /indra/newview/llpanelface.h | |
| parent | ca1f57307a76af2f7c381269e05af74307f9468a (diff) | |
Editing interface for normal and specular maps and other parameters.
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 56b4034a2d..c6322d59b2 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -29,6 +29,7 @@ #include "v4color.h" #include "llpanel.h" +#include "llmaterial.h" class LLButton; class LLCheckBoxCtrl; @@ -42,6 +43,7 @@ class LLTextureCtrl; class LLUICtrl; class LLViewerObject; class LLFloater; +class LLMaterialID; class LLPanelFace : public LLPanel { @@ -74,12 +76,19 @@ protected: void onCommitTexture(const LLSD& data); void onCancelTexture(const LLSD& data); void onSelectTexture(const LLSD& data); + void onCommitMaterialTexture(const LLSD& data); + void onCancelMaterialTexture(const LLSD& data); + void onSelectMaterialTexture(const LLSD& data); void onCommitColor(const LLSD& data); + void onCommitShinyColor(const LLSD& data); void onCommitAlpha(const LLSD& data); void onCancelColor(const LLSD& data); void onSelectColor(const LLSD& data); + void onMaterialLoaded(const LLMaterialID& material_id, const LLMaterialPtr material); + void updateMaterial(); static void onCommitTextureInfo( LLUICtrl* ctrl, void* userdata); + static void onCommitMaterial( LLUICtrl* ctrl, void* userdata); static void onCommitMaterialsMedia( LLUICtrl* ctrl, void* userdata); static void onCommitMaterialType( LLUICtrl* ctrl, void* userdata); static void onCommitBump( LLUICtrl* ctrl, void* userdata); @@ -103,6 +112,9 @@ private: */ void onTextureSelectionChanged(LLInventoryItem* itemp); + LLMaterialID mMaterialID; + LLMaterialPtr mMaterial; + BOOL mIsAlpha; }; #endif |