diff options
author | Armin Weatherwax | 2010-11-08 19:51:32 +0100 |
---|---|---|
committer | Armin Weatherwax | 2010-11-09 23:31:11 +0100 |
commit | 44c07eb2c58c4898752ad813d46c224ccd7229f1 (patch) | |
tree | 27d79577d2f4afc0401cd9593e2c7a60e333c624 /linden/indra/newview/jcfloaterareasearch.h | |
parent | As we currently do not build the gstreamer plugin for windows, do not try to ... (diff) | |
download | meta-impy-44c07eb2c58c4898752ad813d46c224ccd7229f1.zip meta-impy-44c07eb2c58c4898752ad813d46c224ccd7229f1.tar.gz meta-impy-44c07eb2c58c4898752ad813d46c224ccd7229f1.tar.bz2 meta-impy-44c07eb2c58c4898752ad813d46c224ccd7229f1.tar.xz |
feature: add a tiny context menu to areasearch scroll list items
rightclick one of the results and teleport or cam to the object or bring it in edit mode
Diffstat (limited to 'linden/indra/newview/jcfloaterareasearch.h')
-rw-r--r-- | linden/indra/newview/jcfloaterareasearch.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linden/indra/newview/jcfloaterareasearch.h b/linden/indra/newview/jcfloaterareasearch.h index 1512030..5bceb59 100644 --- a/linden/indra/newview/jcfloaterareasearch.h +++ b/linden/indra/newview/jcfloaterareasearch.h | |||
@@ -35,9 +35,11 @@ | |||
35 | #include "lluuid.h" | 35 | #include "lluuid.h" |
36 | #include "llstring.h" | 36 | #include "llstring.h" |
37 | #include "llframetimer.h" | 37 | #include "llframetimer.h" |
38 | #include "llmemberlistener.h" | ||
38 | 39 | ||
39 | class LLTextBox; | 40 | class LLTextBox; |
40 | class LLScrollListCtrl; | 41 | class LLScrollListCtrl; |
42 | class LLScrollListItem; | ||
41 | class LLViewerRegion; | 43 | class LLViewerRegion; |
42 | 44 | ||
43 | struct AObjectDetails | 45 | struct AObjectDetails |
@@ -71,6 +73,7 @@ private: | |||
71 | static void onCommitLine(LLLineEditor* line, void* user_data); | 73 | static void onCommitLine(LLLineEditor* line, void* user_data); |
72 | static void requestIfNeeded(LLViewerObject *objectp); | 74 | static void requestIfNeeded(LLViewerObject *objectp); |
73 | static void onDoubleClick(void *userdata); | 75 | static void onDoubleClick(void *userdata); |
76 | static void onRightMouseDown(S32 x, S32 y, void *userdata); | ||
74 | 77 | ||
75 | enum OBJECT_COLUMN_ORDER | 78 | enum OBJECT_COLUMN_ORDER |
76 | { | 79 | { |
@@ -86,6 +89,7 @@ private: | |||
86 | 89 | ||
87 | LLTextBox* mCounterText; | 90 | LLTextBox* mCounterText; |
88 | LLScrollListCtrl* mResultList; | 91 | LLScrollListCtrl* mResultList; |
92 | LLScrollListItem* mSelectedItem; | ||
89 | LLFrameTimer mLastUpdateTimer; | 93 | LLFrameTimer mLastUpdateTimer; |
90 | 94 | ||
91 | static std::map<LLUUID, AObjectDetails> sObjectDetails; | 95 | static std::map<LLUUID, AObjectDetails> sObjectDetails; |
@@ -96,4 +100,17 @@ private: | |||
96 | static std::string sSearchedGroup; | 100 | static std::string sSearchedGroup; |
97 | 101 | ||
98 | static LLViewerRegion* sLastRegion; | 102 | static LLViewerRegion* sLastRegion; |
103 | |||
104 | LLHandle<LLView> mPopupMenuHandle; | ||
105 | |||
106 | class PopupMenuHandler : public LLMemberListener<JCFloaterAreaSearch> | ||
107 | { | ||
108 | public: PopupMenuHandler(const JCFloaterAreaSearch* instance); | ||
109 | |||
110 | /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); | ||
111 | |||
112 | const JCFloaterAreaSearch* mInstance; | ||
113 | }; | ||
114 | |||
115 | class PopupMenuHandler* mPopupMenuHandler; | ||
99 | }; | 116 | }; |