diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
| commit | 037cbf82310710a1ec8f0affd2bba24aa87d20b5 (patch) | |
| tree | 51eb135eaaff94a8ed119486d05e963c2cd8a676 /indra/llui/llcommandmanager.cpp | |
| parent | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (diff) | |
| parent | e285d515d5b94acce280edf586a16272931749d9 (diff) | |
Merge lion for good measure
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
| -rwxr-xr-x | indra/llui/llcommandmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index 625fb8e870..ab37ee48b6 100755 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -50,6 +50,7 @@ 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") @@ -71,6 +72,7 @@ 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) |