From 61d550ee85b371add15d174b4f6fbd93624c3490 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Thu, 24 May 2012 19:20:37 +0300 Subject: CHUI-78 FIXED group actions gear menu in People->Groups. Used the same menu for groups list context menu and gear menu in People->Groups. Changed the type of groups list context menu to toggleable. --- indra/newview/llgrouplist.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llgrouplist.h') diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 8abf14b3d0..6c8f4406ab 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -28,10 +28,13 @@ #define LL_LLGROUPLIST_H #include "llevent.h" +#include "llpointer.h" + #include "llflatlistview.h" #include "llpanel.h" -#include "llpointer.h" #include "llstyle.h" +#include "lltoggleablemenu.h" + #include "llgroupmgr.h" /** @@ -57,6 +60,8 @@ public: void toggleIcons(); bool getIconsVisible() const { return mShowIcons; } + LLToggleableMenu* getContextMenu() const { return mContextMenuHandle.get(); } + private: void setDirty(bool val = true) { mDirty = val; } void refresh(); @@ -66,7 +71,7 @@ private: bool onContextMenuItemClick(const LLSD& userdata); bool onContextMenuItemEnable(const LLSD& userdata); - LLHandle mContextMenuHandle; + LLHandle mContextMenuHandle; bool mShowIcons; bool mDirty; -- cgit v1.2.3 From 3807f97facc79960c579793376412a0baf6b9de3 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Fri, 22 Jun 2012 18:13:34 +0300 Subject: CHUI-136 FIXED (Implement new design for blocked list on the people floater) - Created new LLBlockList class and replaced LLScrollContainer with it - Also created new LLBlockedListItem class which represents blocked objects and blocked avatars --- indra/newview/llgrouplist.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llgrouplist.h') diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index 6c8f4406ab..e96a720886 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -48,6 +48,10 @@ class LLGroupList: public LLFlatListViewEx, public LLOldEvents::LLSimpleListener { LOG_CLASS(LLGroupList); public: + struct Params : public LLInitParam::Block + { + Params(){}; + }; LLGroupList(const Params& p); virtual ~LLGroupList(); -- cgit v1.2.3