diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
| commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
| tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/llui/llcommandmanager.cpp | |
| parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
merging in latest changes, resolved llimview.cpp conflict
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) { } |