diff options
author | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
commit | 50005b81f7788cd7a372ab3009568bdb9e024a6e (patch) | |
tree | 829bd18ebb1ec90234973a980979ca92cebe38ff /indra/llui/llpanel.h | |
parent | 2051ba7248f11af083bbda9cd8b67be99d0d844b (diff) | |
parent | 9b526997d93d9290602a86f91a7f096da4395d97 (diff) |
merge
Diffstat (limited to 'indra/llui/llpanel.h')
-rw-r--r-- | indra/llui/llpanel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 03e3dc0c0e..784054cd86 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -170,6 +170,7 @@ public: std::string getString(const std::string& name) const; // ** Wrappers for setting child properties by name ** -TomY + // WARNING: These are deprecated, please use getChild<T>("name")->doStuff() idiom instead // LLView void childSetVisible(const std::string& name, bool visible); @@ -233,7 +234,8 @@ public: void childSetPrevalidate(const std::string& id, bool (*func)(const LLWString &) ); // LLButton - void childSetAction(const std::string& id, boost::function<void(void*)> function, void* value = NULL); + void childSetAction(const std::string& id, boost::function<void(void*)> function, void* value); + void childSetAction(const std::string& id, const commit_signal_t::slot_type& function); // LLTextBox void childSetActionTextbox(const std::string& id, boost::function<void(void*)> function, void* value = NULL); |