summaryrefslogtreecommitdiff
path: root/indra/llui/llcommandmanager.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-02-11 13:41:31 -0500
committerMonty Brandenberg <monty@lindenlab.com>2014-02-11 13:41:31 -0500
commit744381956022c74b8617098ab28b52230dfbd0c2 (patch)
treeb53aafab1f3067c78bc0564bada8da9bff82a48f /indra/llui/llcommandmanager.cpp
parent80ee8a8ca3725265636f8052a2442a74a742338f (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge. Refresh from viewer-release after 3.7.0 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)