diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lldebugmessagebox.h | |
parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lldebugmessagebox.h')
-rw-r--r-- | indra/newview/lldebugmessagebox.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldebugmessagebox.h b/indra/newview/lldebugmessagebox.h index 07062218ac..76e128cfc1 100644 --- a/indra/newview/lldebugmessagebox.h +++ b/indra/newview/lldebugmessagebox.h @@ -66,8 +66,8 @@ protected: ~LLDebugVarMessageBox(); static LLDebugVarMessageBox* show(const std::string& title, EDebugVarType var_type, void *var); - static void slider_changed(LLUICtrl* ctrl, void* user_data); - static void onAnimateClicked(void* user_data); + void sliderChanged(const LLSD& data); + void onAnimateClicked(const LLSD& data); public: static void show(const std::string& title, F32 *var, F32 max_value = 100.f, F32 increment = 0.1f); |