diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
| commit | d215cd5c244a5448668cb2173b1d95d0d6adf3ae (patch) | |
| tree | 1ca61d7f58f2cfd063167c235431cf3836416db4 /indra/newview/llgrouplist.h | |
| parent | 37b04c150792bb3e53a5ba02c6631aa1d0f8686f (diff) | |
| parent | c72de2edf0a2f7590fd43d86c59e83afcf7e8bcf (diff) | |
automated merge PE->viewer2.0
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; |