summaryrefslogtreecommitdiff
path: root/indra/llui/llcommandmanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-07 15:15:59 -0500
committerOz Linden <oz@lindenlab.com>2014-01-07 15:15:59 -0500
commitfcac9fdaddaea6ec94d1c3726c8f19809d696169 (patch)
tree1b7c9c8412323110664154e1189b7fa854b524ba /indra/llui/llcommandmanager.cpp
parentad40f7534fdae6ec85597bbfce32e72248cd61fa (diff)
parenta25bcb8523db08877c47fdbd834589ebbe45ff82 (diff)
merge changes for Snowstorm fall contributions
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)