diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
commit | 4dd15ae27d1216044da57455eaa2a4832f86915f (patch) | |
tree | 277056b7e3c98a3f4305c1a3553ee0ee18a8eb1c /indra/llui/lluictrl.h | |
parent | d65d451448573f95b065a9be7c88ff239d5ed8be (diff) | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) |
merge
Diffstat (limited to 'indra/llui/lluictrl.h')
-rw-r--r-- | indra/llui/lluictrl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 8a8b589e9c..3e055a9d06 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -76,14 +76,14 @@ public: Optional<enable_callback_t> function; }; - struct EnableControls : public LLInitParam::Choice<EnableControls> + struct EnableControls : public LLInitParam::ChoiceBlock<EnableControls> { Alternative<std::string> enabled; Alternative<std::string> disabled; EnableControls(); }; - struct ControlVisibility : public LLInitParam::Choice<ControlVisibility> + struct ControlVisibility : public LLInitParam::ChoiceBlock<ControlVisibility> { Alternative<std::string> visible; Alternative<std::string> invisible; @@ -235,6 +235,9 @@ public: // topic then put in help_topic_out bool findHelpTopic(std::string& help_topic_out); + boost::signals2::connection setCommitCallback(const CommitCallbackParam& cb); + boost::signals2::connection setValidateCallback(const EnableCallbackParam& cb); + boost::signals2::connection setCommitCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setValidateCallback( const enable_signal_t::slot_type& cb ); |