diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-21 13:03:14 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-21 13:03:14 -0800 |
| commit | 2f91768d96683515383570c8aae21bd126fd0ad6 (patch) | |
| tree | 8c0a34f7e5aa4ae519d3c10e1c6fc8e9b83cb006 /indra/newview/llgrouplist.h | |
| parent | d74d0d5c41d5ea114cef19aa7e54834d1c3b554b (diff) | |
| parent | 0e6f0e5ca16f534ff14c57c77c323bed2d6e730c (diff) | |
merge.
Diffstat (limited to 'indra/newview/llgrouplist.h')
| -rw-r--r-- | indra/newview/llgrouplist.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 33cfe005b9..f7afe0c0b2 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -60,6 +60,7 @@ public: virtual ~LLGroupList(); virtual void draw(); // from LLView + /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView void setNameFilter(const std::string& filter); void toggleIcons(); @@ -71,6 +72,11 @@ private: void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, EAddPosition pos = ADD_BOTTOM); bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); // called on agent group list changes + bool onContextMenuItemClick(const LLSD& userdata); + bool onContextMenuItemEnable(const LLSD& userdata); + + LLHandle<LLView> mContextMenuHandle; + bool mShowIcons; bool mDirty; std::string mNameFilter; |