diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
| commit | 75722baf295aff7927bff3c70cdf0ec27399cb37 (patch) | |
| tree | a7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/llui/llcommandmanager.cpp | |
| parent | 5c68b2456e8603322a1f12694c196246752bab53 (diff) | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
| -rw-r--r-- | indra/llui/llcommandmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index 0e2f3f1961..625fb8e870 100644 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -63,6 +63,7 @@ LLCommand::Params::Params() , is_running_parameters("is_running_parameters") , is_starting_function("is_starting_function") , is_starting_parameters("is_starting_parameters") + , is_flashing_allowed("is_flashing_allowed", false) { } @@ -83,6 +84,7 @@ LLCommand::LLCommand(const LLCommand::Params& p) , mIsRunningParameters(p.is_running_parameters) , mIsStartingFunction(p.is_starting_function) , mIsStartingParameters(p.is_starting_parameters) + , mIsFlashingAllowed(p.is_flashing_allowed) { } |