From 1713a3552b7017cbf781f2effd448f2e8cfb9372 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:52:30 +0000 Subject: merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2 * Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu) --- indra/newview/llpanelteleporthistory.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'indra/newview/llpanelteleporthistory.h') diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h index 66187e69c6..ebba25cfa5 100644 --- a/indra/newview/llpanelteleporthistory.h +++ b/indra/newview/llpanelteleporthistory.h @@ -37,6 +37,7 @@ #include "llpanelplacestab.h" #include "llteleporthistory.h" +#include "llmenugl.h" class LLTeleportHistoryStorage; class LLAccordionCtrl; @@ -46,6 +47,25 @@ class LLFlatListView; class LLTeleportHistoryPanel : public LLPanelPlacesTab { public: + class ContextMenu + { + public: + ContextMenu(); + void show(LLView* spawning_view, S32 index, S32 x, S32 y); + + private: + LLContextMenu* createMenu(); + void onTeleport(); + void onInfo(); + void onCopy(); + void onMakeLandmark(); + + static void gotSLURLCallback(const std::string& slurl); + + LLContextMenu* mMenu; + S32 mIndex; + }; + LLTeleportHistoryPanel(); virtual ~LLTeleportHistoryPanel(); @@ -59,6 +79,9 @@ public: private: static void onDoubleClickItem(void* user_data); + void onAccordionTabRightClick(LLView *view, S32 x, S32 y, MASK mask); + void onAccordionTabOpen(LLAccordionCtrlTab *tab); + void onAccordionTabClose(LLAccordionCtrlTab *tab); void showTeleportHistory(); void handleItemSelect(LLFlatListView* ); LLFlatListView* getFlatListViewFromTab(LLAccordionCtrlTab *); @@ -70,6 +93,9 @@ private: typedef LLDynamicArray item_containers_t; item_containers_t mItemContainers; + + ContextMenu mContextMenu; + LLContextMenu* mAccordionTabMenu; }; #endif //LL_LLPANELTELEPORTHISTORY_H -- cgit v1.2.3