diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
| commit | 73caee4208a4e05f66583de099502012fd8415ea (patch) | |
| tree | ff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/newview/llfavoritesbar.h | |
| parent | 1db494f58ad378b8028c1f071196be82af5fe964 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
| -rw-r--r-- | indra/newview/llfavoritesbar.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 7da33e2f6e..824b396add 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -40,7 +40,12 @@ class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver { public: - struct Params : public LLUICtrl::Params{}; + struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> + { + Optional<std::string> chevron_button_tool_tip; + Params(); + }; + protected: LLFavoritesBarCtrl(const Params&); friend class LLUICtrlFactory; @@ -69,6 +74,9 @@ protected: void onButtonRightClick(LLUUID id,LLView* button,S32 x,S32 y,MASK mask); void doToSelected(const LLSD& userdata); + BOOL isClipboardPasteable() const; + void pastFromClipboard() const; + void showDropDownMenu(); @@ -84,6 +92,8 @@ protected: LLUUID mSelectedItemID; LLRect mChevronRect; + + std::string mChevronButtonToolTip; }; |