Merge branch 'release/maint-b' into nat/maint-b-tests

1 files changed, 82 insertions, 82 deletions

diff --git a/indra/newview/llsearchableui.h b/indra/newview/llsearchableui.h
index 84fcefb835..de9f2c2efe 100644
--- a/indra/newview/llsearchableui.h
+++ b/indra/newview/llsearchableui.h
@@ -35,88 +35,88 @@ class LLTabContainer;
 
 namespace ll
 {
-	namespace prefs
-	{
-		struct SearchableItem;
-		struct PanelData;
-		struct TabContainerData;
-
-		typedef std::shared_ptr< SearchableItem > SearchableItemPtr;
-		typedef std::shared_ptr< PanelData > PanelDataPtr;
-		typedef std::shared_ptr< TabContainerData > TabContainerDataPtr;
-
-		typedef std::vector< TabContainerData > tTabContainerDataList;
-		typedef std::vector< SearchableItemPtr > tSearchableItemList;
-		typedef std::vector< PanelDataPtr > tPanelDataList;
-
-		struct SearchableItem
-		{
-			LLWString mLabel;
-			LLView const *mView;
-			ll::ui::SearchableControl const *mCtrl;
-
-			std::vector< std::shared_ptr< SearchableItem >  > mChildren;
-
-			virtual ~SearchableItem();
-
-			void setNotHighlighted();
-			virtual bool hightlightAndHide( LLWString const &aFilter );
-		};
-
-		struct PanelData
-		{
-			LLPanel const *mPanel;
-			std::string mLabel;
-
-			std::vector< std::shared_ptr< SearchableItem > > mChildren;
-			std::vector< std::shared_ptr< PanelData > > mChildPanel;
-
-			virtual ~PanelData();
-
-			void setNotHighlighted();
-			virtual bool hightlightAndHide( LLWString const &aFilter );
-		};
-
-		struct TabContainerData: public PanelData
-		{
-			LLTabContainer *mTabContainer;
-			virtual bool hightlightAndHide( LLWString const &aFilter );
-		};
-
-		struct SearchData
-		{
-			TabContainerDataPtr mRootTab;
-			LLWString mLastFilter;
-		};
-	}
-	namespace statusbar
-	{
-		struct SearchableItem;
-
-		typedef std::shared_ptr< SearchableItem > SearchableItemPtr;
-
-		typedef std::vector< SearchableItemPtr > tSearchableItemList;
-
-		struct SearchableItem
-		{
-			LLWString mLabel;
-			LLMenuItemGL *mMenu;
-			tSearchableItemList mChildren;
-			ll::ui::SearchableControl const *mCtrl;
-			bool mWasHiddenBySearch;
-
-			SearchableItem();
-
-			void setNotHighlighted( );
-			bool hightlightAndHide( LLWString const &aFilter, bool hide = true );
-		};
-
-		struct SearchData
-		{
-			SearchableItemPtr mRootMenu;
-			LLWString mLastFilter;
-		};
-	}
+    namespace prefs
+    {
+        struct SearchableItem;
+        struct PanelData;
+        struct TabContainerData;
+
+        typedef std::shared_ptr< SearchableItem > SearchableItemPtr;
+        typedef std::shared_ptr< PanelData > PanelDataPtr;
+        typedef std::shared_ptr< TabContainerData > TabContainerDataPtr;
+
+        typedef std::vector< TabContainerData > tTabContainerDataList;
+        typedef std::vector< SearchableItemPtr > tSearchableItemList;
+        typedef std::vector< PanelDataPtr > tPanelDataList;
+
+        struct SearchableItem
+        {
+            LLWString mLabel;
+            LLView const *mView;
+            ll::ui::SearchableControl const *mCtrl;
+
+            std::vector< std::shared_ptr< SearchableItem >  > mChildren;
+
+            virtual ~SearchableItem();
+
+            void setNotHighlighted();
+            virtual bool hightlightAndHide( LLWString const &aFilter );
+        };
+
+        struct PanelData
+        {
+            LLPanel const *mPanel;
+            std::string mLabel;
+
+            std::vector< std::shared_ptr< SearchableItem > > mChildren;
+            std::vector< std::shared_ptr< PanelData > > mChildPanel;
+
+            virtual ~PanelData();
+
+            void setNotHighlighted();
+            virtual bool hightlightAndHide( LLWString const &aFilter );
+        };
+
+        struct TabContainerData: public PanelData
+        {
+            LLTabContainer *mTabContainer;
+            virtual bool hightlightAndHide( LLWString const &aFilter );
+        };
+
+        struct SearchData
+        {
+            TabContainerDataPtr mRootTab;
+            LLWString mLastFilter;
+        };
+    }
+    namespace statusbar
+    {
+        struct SearchableItem;
+
+        typedef std::shared_ptr< SearchableItem > SearchableItemPtr;
+
+        typedef std::vector< SearchableItemPtr > tSearchableItemList;
+
+        struct SearchableItem
+        {
+            LLWString mLabel;
+            LLMenuItemGL *mMenu;
+            tSearchableItemList mChildren;
+            ll::ui::SearchableControl const *mCtrl;
+            bool mWasHiddenBySearch;
+
+            SearchableItem();
+
+            void setNotHighlighted( );
+            bool hightlightAndHide( LLWString const &aFilter, bool hide = true );
+        };
+
+        struct SearchData
+        {
+            SearchableItemPtr mRootMenu;
+            LLWString mLastFilter;
+        };
+    }
 }
 
 #endif