diff options
author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
commit | 682609d254fb973cfa267923b69c5e06b7efd7e1 (patch) | |
tree | 0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/llui/llcommandmanager.cpp | |
parent | 3596c0f7e139724f31258ffb96157146aeba77b1 (diff) | |
parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
-rw-r--r-- | indra/llui/llcommandmanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index d8e035a320..128ba609cb 100644 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -55,6 +55,8 @@ LLCommand::Params::Params() , tooltip_ref("tooltip_ref") , execute_function("execute_function") , execute_parameters("execute_parameters") + , execute_stop_function("execute_stop_function") + , execute_stop_parameters("execute_stop_parameters") , is_enabled_function("is_enabled_function") , is_enabled_parameters("is_enabled_parameters") , is_running_function("is_running_function") @@ -72,6 +74,8 @@ LLCommand::LLCommand(const LLCommand::Params& p) , mTooltipRef(p.tooltip_ref) , mExecuteFunction(p.execute_function) , mExecuteParameters(p.execute_parameters) + , mExecuteStopFunction(p.execute_stop_function) + , mExecuteStopParameters(p.execute_stop_parameters) , mIsEnabledFunction(p.is_enabled_function) , mIsEnabledParameters(p.is_enabled_parameters) , mIsRunningFunction(p.is_running_function) |