diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
| commit | 012a0953b56d8313c6c0f71444f115de1aeeb7e1 (patch) | |
| tree | 59fece92dfa8895d852e997b884ace46b9e1b3a9 /indra/llui/llcommandmanager.cpp | |
| parent | 7c08ddb3f748d2173948335fd799879e3d58d81c (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
merge
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
| -rw-r--r-- | indra/llui/llcommandmanager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index 128ba609cb..0e2f3f1961 100644 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -41,7 +41,7 @@ // LLCommandId class // -const LLCommandId LLCommandId::null = LLCommandId(); +const LLCommandId LLCommandId::null = LLCommandId("null command"); // // LLCommand class @@ -67,10 +67,11 @@ LLCommand::Params::Params() } LLCommand::LLCommand(const LLCommand::Params& p) - : mAvailableInToybox(p.available_in_toybox) + : mIdentifier(p.name) + , mAvailableInToybox(p.available_in_toybox) , mIcon(p.icon) - , mIdentifier(p.name) , mLabelRef(p.label_ref) + , mName(p.name) , mTooltipRef(p.tooltip_ref) , mExecuteFunction(p.execute_function) , mExecuteParameters(p.execute_parameters) @@ -134,7 +135,7 @@ void LLCommandManager::addCommand(LLCommand * command) mCommandIndices[command_id.uuid()] = mCommands.size(); mCommands.push_back(command); - lldebugs << "Successfully added command: " << command->id().name() << llendl; + lldebugs << "Successfully added command: " << command->name() << llendl; } //static |