summaryrefslogtreecommitdiff
path: root/indra/llui/llcommandmanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-02-25 13:31:01 -0500
committerOz Linden <oz@lindenlab.com>2014-02-25 13:31:01 -0500
commit1d30fe955442855dd3102a006d6e4120d2f416b4 (patch)
tree1783c0818fb473e1bd8a5ed7a4622f45e30fc99d /indra/llui/llcommandmanager.cpp
parent9b42503379bc2e9698545543670306961f7db991 (diff)
parentde8fea13627cc5978b8a6135802a52864a11c39a (diff)
merge changes for 3.7.2-release
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
-rwxr-xr-xindra/llui/llcommandmanager.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 49cfb2255e..625fb8e870 100755
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -50,8 +50,6 @@ const LLCommandId LLCommandId::null = LLCommandId("null command");
LLCommand::Params::Params()
: available_in_toybox("available_in_toybox", false)
, icon("icon")
- , hover_icon_unselected("hover_icon_unselected")
- , hover_icon_selected("hover_icon_selected")
, label_ref("label_ref")
, name("name")
, tooltip_ref("tooltip_ref")
@@ -73,8 +71,6 @@ LLCommand::LLCommand(const LLCommand::Params& p)
: mIdentifier(p.name)
, mAvailableInToybox(p.available_in_toybox)
, mIcon(p.icon)
- , mHoverIconUnselected(p.hover_icon_unselected)
- , mHoverIconSelected(p.hover_icon_selected)
, mLabelRef(p.label_ref)
, mName(p.name)
, mTooltipRef(p.tooltip_ref)