EXP-1286 : Clean-up the mess I added to llcommandmanager. All CommandId now have a trusted UUID which is the base for indexing and comparison.

1 files changed, 2 insertions, 17 deletions

diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 2bd50af7af..9ce7533e1b 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -114,7 +114,7 @@ LLCommand * LLCommandManager::getCommand(const LLCommandId& commandId)
 {
 	LLCommand * command_match = NULL;
 
-	CommandIndexMap::const_iterator found = mCommandIndices.find(commandId);
+	CommandIndexMap::const_iterator found = mCommandIndices.find(commandId.uuid());
 	
 	if (found != mCommandIndices.end())
 	{
@@ -124,25 +124,10 @@ LLCommand * LLCommandManager::getCommand(const LLCommandId& commandId)
 	return command_match;
 }
 
-LLCommand * LLCommandManager::getCommand(const LLUUID& commandUUID)
-{
-	LLCommand * command_match = NULL;
-	
-	CommandUUIDMap::const_iterator found = mCommandUUIDs.find(commandUUID);
-	
-	if (found != mCommandUUIDs.end())
-	{
-		command_match = mCommands[found->second];
-	}
-	
-	return command_match;
-}
-
 void LLCommandManager::addCommand(LLCommand * command)
 {
 	LLCommandId command_id = command->id();
-	mCommandIndices[command_id] = mCommands.size();
-	mCommandUUIDs[command_id.uuid()] = mCommands.size();
+	mCommandIndices[command_id.uuid()] = mCommands.size();
 	mCommands.push_back(command);
 
 	lldebugs << "Successfully added command: " << command->id().name() << llendl;