1 files changed, 15 insertions, 1 deletions
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 8f9f956ec7..9b93ab735a 100644
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -50,6 +50,12 @@ public:
 		{}
 	};
 
+	LLCommandId()
+		: mName("null command")
+	{
+		mUUID = LLUUID::generateNewID(mName);
+	}
+	
 	LLCommandId(const std::string& name)
 		: mName(name)
 	{
@@ -65,7 +71,6 @@ public:
 	LLCommandId(const LLUUID& uuid)
 	:	mName(""),
 		mUUID(uuid)
-	
 	{
 	}
 	
@@ -111,6 +116,9 @@ public:
 		Mandatory<std::string>	execute_function;
 		Optional<LLSD>			execute_parameters;
 
+		Optional<std::string>	execute_stop_function;
+		Optional<LLSD>			execute_stop_parameters;
+		
 		Optional<std::string>	is_enabled_function;
 		Optional<LLSD>			is_enabled_parameters;
 
@@ -134,6 +142,9 @@ public:
 	const std::string& executeFunctionName() const { return mExecuteFunction; }
 	const LLSD& executeParameters() const { return mExecuteParameters; }
 
+	const std::string& executeStopFunctionName() const { return mExecuteStopFunction; }
+	const LLSD& executeStopParameters() const { return mExecuteStopParameters; }
+	
 	const std::string& isEnabledFunctionName() const { return mIsEnabledFunction; }
 	const LLSD& isEnabledParameters() const { return mIsEnabledParameters; }
 
@@ -154,6 +165,9 @@ private:
 	std::string mExecuteFunction;
 	LLSD        mExecuteParameters;
 
+	std::string mExecuteStopFunction;
+	LLSD        mExecuteStopParameters;
+	
 	std::string mIsEnabledFunction;
 	LLSD        mIsEnabledParameters;