diff options
Diffstat (limited to 'indra/newview/llpanelvolume.h')
| -rw-r--r-- | indra/newview/llpanelvolume.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 841880b147..9d197aafa5 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -35,7 +35,7 @@ #include "v3math.h" #include "llpanel.h" -#include "llmemory.h" +#include "llpointer.h" #include "llvolume.h" class LLSpinCtrl; @@ -51,7 +51,7 @@ class LLColorSwatchCtrl; class LLPanelVolume : public LLPanel { public: - LLPanelVolume(const std::string& name); + LLPanelVolume(); virtual ~LLPanelVolume(); virtual void draw(); @@ -64,15 +64,19 @@ public: void sendIsLight(); void sendIsFlexible(); - static BOOL precommitValidate(LLUICtrl* ctrl,void* userdata); + static bool precommitValidate(const LLSD& data); static void onCommitIsLight( LLUICtrl* ctrl, void* userdata); static void onCommitLight( LLUICtrl* ctrl, void* userdata); static void onCommitIsFlexible( LLUICtrl* ctrl, void* userdata); static void onCommitFlexible( LLUICtrl* ctrl, void* userdata); - static void onLightCancelColor(LLUICtrl* ctrl, void* userdata); - static void onLightSelectColor(LLUICtrl* ctrl, void* userdata); + void onLightCancelColor(const LLSD& data); + void onLightSelectColor(const LLSD& data); + + void onLightCancelTexture(const LLSD& data); + void onLightSelectTexture(const LLSD& data); + protected: void getState(); @@ -99,6 +103,7 @@ protected: */ LLColor4 mLightSavedColor; + LLUUID mLightSavedTexture; LLPointer<LLViewerObject> mObject; LLPointer<LLViewerObject> mRootObject; }; |