diff options
| author | callum <none@none> | 2011-10-20 15:03:28 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-20 15:03:28 -0700 |
| commit | 6998c5ebc7aad43d44f1bb6e42e20503c2ff144f (patch) | |
| tree | 916f1c113192211d85a7772b4b62df65f0a613d7 /indra/llui/llcommandmanager.cpp | |
| parent | a1561c20e063060a6a54b4e66968404e4cb15d8a (diff) | |
| parent | 4a90d9f3d6d4491aab8b17bc8dc7f3c8ac90de49 (diff) | |
Merge with head
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 |