diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
| commit | 30ff6cabd61f2f083df5df1e6e70cc94742af477 (patch) | |
| tree | 631935f1cf59d19a91cdad65e9a75fe825afda7d /indra/newview/llpanelvolume.h | |
| parent | ff11d74820c89822cd067b51727d9df1dc87d0d0 (diff) | |
| parent | 3ac3a4b206c08ed06b889bdaa24074b6aa0e020a (diff) | |
Merge with trunk
Diffstat (limited to 'indra/newview/llpanelvolume.h')
| -rw-r--r-- | indra/newview/llpanelvolume.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 841880b147..f285141bbe 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,15 @@ 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); protected: void getState(); |