diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:36:34 -0500 |
commit | a5e56067c28298b4df0ef498303f78f67c35782c (patch) | |
tree | ec5cf26d0eb8825a6d30fcf325e4862ddc353890 /indra/llui/llcommandmanager.cpp | |
parent | 197db4976ad8df958b7b2c59a66498398cfd0665 (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
merge changes for 3.7.2-release
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
-rwxr-xr-x | indra/llui/llcommandmanager.cpp | 4 |
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) |