diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
commit | 744381956022c74b8617098ab28b52230dfbd0c2 (patch) | |
tree | b53aafab1f3067c78bc0564bada8da9bff82a48f /indra/llui/llcommandmanager.h | |
parent | 80ee8a8ca3725265636f8052a2442a74a742338f (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge. Refresh from viewer-release after 3.7.0 release
Diffstat (limited to 'indra/llui/llcommandmanager.h')
-rwxr-xr-x | indra/llui/llcommandmanager.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h index 9f276f712d..ff5a8a3257 100755 --- a/indra/llui/llcommandmanager.h +++ b/indra/llui/llcommandmanager.h @@ -96,9 +96,6 @@ public: Mandatory<std::string> name; Mandatory<std::string> tooltip_ref; - Optional<std::string> hover_icon_selected; - Optional<std::string> hover_icon_unselected; - Mandatory<std::string> execute_function; Optional<LLSD> execute_parameters; @@ -127,8 +124,6 @@ public: const std::string& labelRef() const { return mLabelRef; } const std::string& name() const { return mName; } const std::string& tooltipRef() const { return mTooltipRef; } - const std::string& hoverIconUnselected() const {return mHoverIconUnselected; } - const std::string& hoverIconSelected() const {return mHoverIconSelected; } const std::string& executeFunctionName() const { return mExecuteFunction; } const LLSD& executeParameters() const { return mExecuteParameters; } @@ -155,8 +150,6 @@ private: std::string mLabelRef; std::string mName; std::string mTooltipRef; - std::string mHoverIconUnselected; - std::string mHoverIconSelected; std::string mExecuteFunction; LLSD mExecuteParameters; |