1 files changed, 31 insertions, 5 deletions

diff --git a/linden/indra/llui/llviewquery.h b/linden/indra/llui/llviewquery.h
index 9fe51a4..2e2b50d 100644
--- a/linden/indra/llui/llviewquery.h
+++ b/linden/indra/llui/llviewquery.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -35,6 +35,7 @@
 #include <list> 
 
 #include "llmemory.h"
+#include "llui.h"
 
 class LLView;
 
@@ -42,35 +43,60 @@ typedef std::list<LLView *>			viewList_t;
 typedef std::pair<BOOL, BOOL>           filterResult_t;
 
 // Abstract base class for all filters.
-class LLQueryFilter : public LLRefCount
+class LLQueryFilter
 {
 public:
+        virtual ~LLQueryFilter() {};
         virtual filterResult_t operator() (const LLView* const view, const viewList_t & children) const =0;
 };
 
-class LLQuerySorter : public LLRefCount
+class LLQuerySorter
 {
 public:
+        virtual ~LLQuerySorter() {};
         virtual void operator() (LLView * parent, viewList_t &children) const;
 };
 
-class LLNoLeavesFilter : public LLQueryFilter, public LLSingleton<LLNoLeavesFilter>
+class LLLeavesFilter : public LLQueryFilter, public LLSingleton<LLLeavesFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
+class LLRootsFilter : public LLQueryFilter, public LLSingleton<LLRootsFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+
 class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
 class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
 class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
 
+class LLCtrlFilter : public LLQueryFilter, public LLSingleton<LLCtrlFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+
+class LLWidgetTypeFilter : public LLQueryFilter
+{
+public:
+        LLWidgetTypeFilter(EWidgetType type) : mType(type) {};
+private:
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+
+        EWidgetType mType;
+};
+
 // Algorithm for flattening
 class LLViewQuery
 {