From 970ee73e9a9cd1c94c295c9decb4d632886c19e6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Oct 2013 11:48:43 -0700
Subject: Fix release merge issues (included upstream changes not yet in
 release from bear)

---
 indra/llui/llcommandmanager.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/llui/llcommandmanager.h')

diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 47a9b86785..ff5a8a3257 100755
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -96,8 +96,6 @@ public:
 		Mandatory<std::string>	name;
 		Mandatory<std::string>	tooltip_ref;
 
-		Optional<std::string>   hover_icon;
-
 		Mandatory<std::string>	execute_function;
 		Optional<LLSD>			execute_parameters;
 
@@ -126,7 +124,6 @@ public:
 	const std::string& labelRef() const { return mLabelRef; }
 	const std::string& name() const { return mName; }
 	const std::string& tooltipRef() const { return mTooltipRef; }
-	const std::string& hoverIcon() const {return mHoverIcon; }
 
 	const std::string& executeFunctionName() const { return mExecuteFunction; }
 	const LLSD& executeParameters() const { return mExecuteParameters; }
@@ -153,7 +150,6 @@ private:
 	std::string mLabelRef;
 	std::string mName;
 	std::string mTooltipRef;
-	std::string mHoverIcon;
 
 	std::string mExecuteFunction;
 	LLSD        mExecuteParameters;
-- 
cgit v1.2.3