diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/lldebugmessagebox.h | |
parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
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); |