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, 10 insertions, 6 deletions

diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 8e5abd6461..8f9f956ec7 100644
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -62,17 +62,24 @@ public:
 		mUUID = LLUUID::generateNewID(p.name);
 	}
 
+	LLCommandId(const LLUUID& uuid)
+	:	mName(""),
+		mUUID(uuid)
+	
+	{
+	}
+	
 	const std::string& name() const { return mName; }
 	const LLUUID& uuid() const { return mUUID; }
 
 	bool operator!=(const LLCommandId& command) const
 	{
-		return (mName != command.mName);
+		return (mUUID != command.mUUID);
 	}
 
 	bool operator==(const LLCommandId& command) const
 	{
-		return (mName == command.mName);
+		return (mUUID == command.mUUID);
 	}
 
 	bool operator<(const LLCommandId& command) const
@@ -178,7 +185,6 @@ public:
 	U32 commandCount() const;
 	LLCommand * getCommand(U32 commandIndex);
 	LLCommand * getCommand(const LLCommandId& commandId);
-	LLCommand * getCommand(const LLUUID& commandUUID);
 
 	static bool load();
 
@@ -186,13 +192,11 @@ protected:
 	void addCommand(LLCommand * command);
 
 private:
-	typedef std::map<LLUUID, U32>	    CommandUUIDMap;
-	typedef std::map<LLCommandId, U32>	CommandIndexMap;
+	typedef std::map<LLUUID, U32>		CommandIndexMap;
 	typedef std::vector<LLCommand *>	CommandVector;
 	
 	CommandVector	mCommands;
 	CommandIndexMap	mCommandIndices;
-	CommandUUIDMap	mCommandUUIDs;
 };