From f8e5ae8006b144b111f474640beb96ae135ae8ed Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Fri, 4 Oct 2013 14:04:31 +0300
Subject: MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6
 (280797)

---
 indra/llui/llcommandmanager.cpp | 6 ++++--
 indra/llui/llcommandmanager.h   | 9 ++++++---
 indra/llui/lltoolbar.cpp        | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index ab37ee48b6..49cfb2255e 100755
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -50,7 +50,8 @@ const LLCommandId LLCommandId::null = LLCommandId("null command");
 LLCommand::Params::Params()
 	: available_in_toybox("available_in_toybox", false)
 	, icon("icon")
-	, hover_icon("hover_icon")
+	, hover_icon_unselected("hover_icon_unselected")
+	, hover_icon_selected("hover_icon_selected")
 	, label_ref("label_ref")
 	, name("name")
 	, tooltip_ref("tooltip_ref")
@@ -72,7 +73,8 @@ LLCommand::LLCommand(const LLCommand::Params& p)
 	: mIdentifier(p.name)
 	, mAvailableInToybox(p.available_in_toybox)
 	, mIcon(p.icon)
-	, mHoverIcon(p.hover_icon)
+	, mHoverIconUnselected(p.hover_icon_unselected)
+	, mHoverIconSelected(p.hover_icon_selected)
 	, mLabelRef(p.label_ref)
 	, mName(p.name)
 	, mTooltipRef(p.tooltip_ref)
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
index 47a9b86785..9f276f712d 100755
--- a/indra/llui/llcommandmanager.h
+++ b/indra/llui/llcommandmanager.h
@@ -96,7 +96,8 @@ public:
 		Mandatory<std::string>	name;
 		Mandatory<std::string>	tooltip_ref;
 
-		Optional<std::string>   hover_icon;
+		Optional<std::string>   hover_icon_selected;
+		Optional<std::string>   hover_icon_unselected;
 
 		Mandatory<std::string>	execute_function;
 		Optional<LLSD>			execute_parameters;
@@ -126,7 +127,8 @@ 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& hoverIconUnselected() const {return mHoverIconUnselected; }
+	const std::string& hoverIconSelected() const {return mHoverIconSelected; }
 
 	const std::string& executeFunctionName() const { return mExecuteFunction; }
 	const LLSD& executeParameters() const { return mExecuteParameters; }
@@ -153,7 +155,8 @@ private:
 	std::string mLabelRef;
 	std::string mName;
 	std::string mTooltipRef;
-	std::string mHoverIcon;
+	std::string mHoverIconUnselected;
+	std::string mHoverIconSelected;
 
 	std::string mExecuteFunction;
 	LLSD        mExecuteParameters;
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 75f52b8e34..6bfe113933 100755
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -928,7 +928,8 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id)
 	button_p.label = LLTrans::getString(commandp->labelRef());
 	button_p.tool_tip = LLTrans::getString(commandp->tooltipRef());
 	button_p.image_overlay = LLUI::getUIImage(commandp->icon());
-	button_p.image_hover_unselected = LLUI::getUIImage(commandp->hoverIcon());
+	button_p.image_hover_unselected = LLUI::getUIImage(commandp->hoverIconUnselected());
+	button_p.image_hover_selected = LLUI::getUIImage(commandp->hoverIconSelected());
 	button_p.button_flash_enable = commandp->isFlashingAllowed();
 	button_p.overwriteFrom(mButtonParams[mButtonType]);
 	LLToolBarButton* button = LLUICtrlFactory::create<LLToolBarButton>(button_p);
-- 
cgit v1.2.3