diff options
| author | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
| commit | 410a084f9a2e030efda635f5a51280b599ab7f78 (patch) | |
| tree | 2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/llui/llcommandmanager.cpp | |
| parent | dad992ea31b6b823c316400e61d50d1aa9e52330 (diff) | |
| parent | fcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff) | |
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
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) |