diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
| commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
| tree | 214b852c8451409d5d355437ddad48199bef976a /indra/llui/llcommandmanager.cpp | |
| parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
Merge with viewer-bear
Diffstat (limited to 'indra/llui/llcommandmanager.cpp')
| -rwxr-xr-x | indra/llui/llcommandmanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index 625fb8e870..49cfb2255e 100755 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -50,6 +50,8 @@ 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") @@ -71,6 +73,8 @@ 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) |