diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-09-28 16:54:34 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-28 16:54:34 -0700 |
commit | fdf042bdb9aeefa209694e04d4012a3a1f911a52 (patch) | |
tree | 37c27b51ac8d940b49073f27da35442f0c6029cc /indra/llui/llcommandmanager.h | |
parent | fc0f5173eb20fad8934420e6eec8873d71490894 (diff) |
EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 FIX -- Populate the toybox floater window with all FUI toolbar buttons indicated as such in the "commands.xml" definition.
EXP-1267 FIX -- Enable/disable buttons in the toybox
* Hooked up button callbacks to the toolbar buttons
* Fixed toybox button enable/disable to function properly and live update as
buttons change states.
* Removed the toybox toolbar background image
Reviewed by Leyla
Diffstat (limited to 'indra/llui/llcommandmanager.h')
-rw-r--r-- | indra/llui/llcommandmanager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h index 4781f77177..6481a05689 100644 --- a/indra/llui/llcommandmanager.h +++ b/indra/llui/llcommandmanager.h @@ -93,7 +93,7 @@ public: Mandatory<std::string> icon; Mandatory<std::string> label_ref; Mandatory<std::string> name; - Optional<std::string> param; + Optional<LLSD> parameter; Mandatory<std::string> tooltip_ref; Params(); @@ -106,7 +106,7 @@ public: const std::string& icon() const { return mIcon; } const LLCommandId& id() const { return mIdentifier; } const std::string& labelRef() const { return mLabelRef; } - const std::string& param() const { return mParam; } + const LLSD& parameter() const { return mParameter; } const std::string& tooltipRef() const { return mTooltipRef; } private: @@ -116,7 +116,7 @@ private: std::string mFunction; std::string mIcon; std::string mLabelRef; - std::string mParam; + LLSD mParameter; std::string mTooltipRef; }; |