Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 34 insertions, 34 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 989968be53..54077b71b2 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llinventorymodelbackgroundfetch.h
  * @brief LLInventoryModelBackgroundFetch class header file
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -43,13 +43,13 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 class LLInventoryModelBackgroundFetch : public LLSingleton<LLInventoryModelBackgroundFetch>
 {
-	LLSINGLETON(LLInventoryModelBackgroundFetch);
-	~LLInventoryModelBackgroundFetch();
+    LLSINGLETON(LLInventoryModelBackgroundFetch);
+    ~LLInventoryModelBackgroundFetch();
 public:
 
     // Start background breadth-first fetching of inventory contents.
-	// This gets triggered when performing a filter-search.
-	void start(const LLUUID& cat_id = LLUUID::null, bool recursive = true);
+    // This gets triggered when performing a filter-search.
+    void start(const LLUUID& cat_id = LLUUID::null, bool recursive = true);
     void scheduleFolderFetch(const LLUUID& cat_id, bool forced = false);
     void scheduleItemFetch(const LLUUID& item_id, bool forced = false);
 
@@ -60,29 +60,29 @@ public:
     // AIS3 only
     void fetchCOF(nullary_func_t callback);
 
-	BOOL folderFetchActive() const;
-	bool isEverythingFetched() const; // completing the fetch once per session should be sufficient
+    BOOL folderFetchActive() const;
+    bool isEverythingFetched() const; // completing the fetch once per session should be sufficient
+
+    bool libraryFetchStarted() const;
+    bool libraryFetchCompleted() const;
+    bool libraryFetchInProgress() const;
 
-	bool libraryFetchStarted() const;
-	bool libraryFetchCompleted() const;
-	bool libraryFetchInProgress() const;
-	
-	bool inventoryFetchStarted() const;
-	bool inventoryFetchCompleted() const;
-	bool inventoryFetchInProgress() const;
+    bool inventoryFetchStarted() const;
+    bool inventoryFetchCompleted() const;
+    bool inventoryFetchInProgress() const;
 
     void findLostItems();
     void incrFetchCount(S32 fetching);
     void incrFetchFolderCount(S32 fetching);
 
-	bool isBulkFetchProcessingComplete() const;
-	void setAllFoldersFetched();
+    bool isBulkFetchProcessingComplete() const;
+    void setAllFoldersFetched();
 
     typedef boost::function<void()> folders_fetched_callback_t;
     boost::signals2::connection setFetchCompletionCallback(folders_fetched_callback_t cb);
 
-	void addRequestAtFront(const LLUUID & id, bool recursive, bool is_category);
-	void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
+    void addRequestAtFront(const LLUUID & id, bool recursive, bool is_category);
+    void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
 
 protected:
     bool isFolderFetchProcessingComplete() const;
@@ -112,30 +112,30 @@ protected:
     void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType fetch_type);
     void bulkFetchViaAis();
     void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
-	void bulkFetch();
+    void bulkFetch();
 
-	void backgroundFetch();
-	static void backgroundFetchCB(void*); // background fetch idle function
+    void backgroundFetch();
+    static void backgroundFetchCB(void*); // background fetch idle function
 
-	bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;
+    bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;
 
 private:
- 	bool mRecursiveInventoryFetchStarted;
-	bool mRecursiveLibraryFetchStarted;
+    bool mRecursiveInventoryFetchStarted;
+    bool mRecursiveLibraryFetchStarted;
     bool mRecursiveMarketplaceFetchStarted; // AIS3 specific
-	bool mAllRecursiveFoldersFetched;
+    bool mAllRecursiveFoldersFetched;
     typedef boost::signals2::signal<void()> folders_fetched_signal_t;
     folders_fetched_signal_t mFoldersFetchedSignal;
 
     bool mBackgroundFetchActive;
-	bool mFolderFetchActive;
-	S32 mFetchCount;
+    bool mFolderFetchActive;
+    S32 mFetchCount;
     S32 mLastFetchCount; // for debug
     S32 mFetchFolderCount;
 
-	LLFrameTimer mFetchTimer;
-	F32 mMinTimeBetweenFetches;
-	fetch_queue_t mFetchFolderQueue;
+    LLFrameTimer mFetchTimer;
+    F32 mMinTimeBetweenFetches;
+    fetch_queue_t mFetchFolderQueue;
     fetch_queue_t mFetchItemQueue;
     uuid_set_t mForceFetchSet;
     std::list<LLUUID> mExpectedFolderIds; // for debug, should this track time?