From 7b4046df83e4353bdade8fbc39387a7bbb3f498d Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Thu, 1 Apr 2010 11:47:21 -0700 Subject: EXT-3531 - Ctrl-P does not work reliably on login --- indra/llui/llflatlistview.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/llui/llflatlistview.h') diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 837fbb36b7..3a2ab54658 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -58,7 +58,7 @@ * - Order of returned selected items are not guaranteed * - The control assumes that all items being added are unique. */ -class LLFlatListView : public LLScrollContainer +class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler { public: @@ -114,7 +114,7 @@ public: Params(); }; - virtual ~LLFlatListView() { clear(); }; + virtual ~LLFlatListView(); /** * Connects callback to signal called when Return key is pressed. @@ -344,7 +344,8 @@ protected: virtual bool selectNextItemPair(bool is_up_direction, bool reset_selection); - virtual bool selectAll(); + virtual BOOL canSelectAll() const; + virtual void selectAll(); virtual bool isSelected(item_pair_t* item_pair) const; -- cgit v1.2.3 From 18d9efff12ef8b59c648a801fe2c5c7e0bc8fde4 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 1 Apr 2010 16:43:58 -0700 Subject: another fix for bad merge --- indra/llui/llflatlistview.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llui/llflatlistview.h') diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index e2f01964de..e3c07e811f 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -114,8 +114,6 @@ public: Params(); }; - virtual ~LLFlatListView(); - /** * Connects callback to signal called when Return key is pressed. */ -- cgit v1.2.3