diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
| commit | 970ee73e9a9cd1c94c295c9decb4d632886c19e6 (patch) | |
| tree | 18cc7f08bbc043252bea9a6f687807116585d286 /indra/llui/llcommandmanager.cpp | |
| parent | d4e622daf2775147c75a75389ffb9b55f8cef799 (diff) | |
Fix release merge issues (included upstream changes not yet in release from bear)
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
| -rwxr-xr-x | indra/llui/llcommandmanager.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index ab37ee48b6..625fb8e870 100755 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -50,7 +50,6 @@ const LLCommandId LLCommandId::null = LLCommandId("null command"); LLCommand::Params::Params() : available_in_toybox("available_in_toybox", false) , icon("icon") - , hover_icon("hover_icon") , label_ref("label_ref") , name("name") , tooltip_ref("tooltip_ref") @@ -72,7 +71,6 @@ LLCommand::LLCommand(const LLCommand::Params& p) : mIdentifier(p.name) , mAvailableInToybox(p.available_in_toybox) , mIcon(p.icon) - , mHoverIcon(p.hover_icon) , mLabelRef(p.label_ref) , mName(p.name) , mTooltipRef(p.tooltip_ref) |