Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 145 insertions, 145 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 831ab80dba..83efbe411a 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -1,145 +1,145 @@
-/** 
- * @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$
- */
-
-#ifndef LL_LLINVENTORYMODELBACKGROUNDFETCH_H
-#define LL_LLINVENTORYMODELBACKGROUNDFETCH_H
-
-#include "llsingleton.h"
-#include "lluuid.h"
-#include "httpcommon.h"
-#include "httprequest.h"
-#include "httpoptions.h"
-#include "httpheaders.h"
-#include "httphandler.h"
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLInventoryModelBackgroundFetch
-//
-// This class handles background fetches, which are fetches of
-// inventory folder.  Fetches can be recursive or not.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLInventoryModelBackgroundFetch : public LLSingleton<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);
-    void scheduleFolderFetch(const LLUUID& cat_id, bool forced = false);
-    void scheduleItemFetch(const LLUUID& item_id, bool forced = false);
-
-    typedef boost::function<void()> nullary_func_t;
-    // AIS3 only, Fetches folder and everithing links inside the folder point to
-    // Intended for outfits
-    void fetchFolderAndLinks(const LLUUID& cat_id, nullary_func_t callback);
-    // AIS3 only
-    void fetchCOF(nullary_func_t callback);
-
-	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 inventoryFetchStarted() const;
-	bool inventoryFetchCompleted() const;
-	bool inventoryFetchInProgress() const;
-
-    void findLostItems();
-    void incrFetchCount(S32 fetching);
-    void incrFetchFolderCount(S32 fetching);
-
-	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);
-
-protected:
-    bool isFolderFetchProcessingComplete() const;
-
-    typedef enum {
-        FT_DEFAULT = 0,
-        FT_FORCED, // request non-recursively even if already loaded
-        FT_CONTENT_RECURSIVE, // request content recursively
-        FT_FOLDER_AND_CONTENT, // request folder, then content recursively
-        FT_RECURSIVE, // request everything recursively
-    } EFetchType;
-    struct FetchQueueInfo
-    {
-        FetchQueueInfo(const LLUUID& id, EFetchType recursive, bool is_category = true)
-            : mUUID(id),
-            mIsCategory(is_category),
-            mFetchType(recursive)
-        {}
-
-        LLUUID mUUID;
-        bool mIsCategory;
-        EFetchType mFetchType;
-    };
-    typedef std::deque<FetchQueueInfo> fetch_queue_t;
-
-    void onAISContentCalback(const LLUUID& request_id, const uuid_vec_t &content_ids, const LLUUID& response_id, EFetchType fetch_type);
-    void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType fetch_type);
-    void bulkFetchViaAis();
-    void bulkFetchViaAis(const FetchQueueInfo& fetch_info);
-	void bulkFetch();
-
-	void backgroundFetch();
-	static void backgroundFetchCB(void*); // background fetch idle function
-
-	bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;
-
-private:
- 	bool mRecursiveInventoryFetchStarted;
-	bool mRecursiveLibraryFetchStarted;
-    bool mRecursiveMarketplaceFetchStarted; // AIS3 specific
-	bool mAllRecursiveFoldersFetched;
-    typedef boost::signals2::signal<void()> folders_fetched_signal_t;
-    folders_fetched_signal_t mFoldersFetchedSignal;
-
-    bool mBackgroundFetchActive;
-	bool mFolderFetchActive;
-	S32 mFetchCount;
-    S32 mLastFetchCount; // for debug
-    S32 mFetchFolderCount;
-
-	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?
-};
-
-#endif // LL_LLINVENTORYMODELBACKGROUNDFETCH_H
-
+/**

+ * @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$

+ */

+

+#ifndef LL_LLINVENTORYMODELBACKGROUNDFETCH_H

+#define LL_LLINVENTORYMODELBACKGROUNDFETCH_H

+

+#include "llsingleton.h"

+#include "lluuid.h"

+#include "httpcommon.h"

+#include "httprequest.h"

+#include "httpoptions.h"

+#include "httpheaders.h"

+#include "httphandler.h"

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryModelBackgroundFetch

+//

+// This class handles background fetches, which are fetches of

+// inventory folder.  Fetches can be recursive or not.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryModelBackgroundFetch : public LLSingleton<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);

+    void scheduleFolderFetch(const LLUUID& cat_id, bool forced = false);

+    void scheduleItemFetch(const LLUUID& item_id, bool forced = false);

+

+    typedef boost::function<void()> nullary_func_t;

+    // AIS3 only, Fetches folder and everithing links inside the folder point to

+    // Intended for outfits

+    void fetchFolderAndLinks(const LLUUID& cat_id, nullary_func_t callback);

+    // AIS3 only

+    void fetchCOF(nullary_func_t callback);

+

+    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 inventoryFetchStarted() const;

+    bool inventoryFetchCompleted() const;

+    bool inventoryFetchInProgress() const;

+

+    void findLostItems();

+    void incrFetchCount(S32 fetching);

+    void incrFetchFolderCount(S32 fetching);

+

+    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);

+

+protected:

+    bool isFolderFetchProcessingComplete() const;

+

+    typedef enum {

+        FT_DEFAULT = 0,

+        FT_FORCED, // request non-recursively even if already loaded

+        FT_CONTENT_RECURSIVE, // request content recursively

+        FT_FOLDER_AND_CONTENT, // request folder, then content recursively

+        FT_RECURSIVE, // request everything recursively

+    } EFetchType;

+    struct FetchQueueInfo

+    {

+        FetchQueueInfo(const LLUUID& id, EFetchType recursive, bool is_category = true)

+            : mUUID(id),

+            mIsCategory(is_category),

+            mFetchType(recursive)

+        {}

+

+        LLUUID mUUID;

+        bool mIsCategory;

+        EFetchType mFetchType;

+    };

+    typedef std::deque<FetchQueueInfo> fetch_queue_t;

+

+    void onAISContentCalback(const LLUUID& request_id, const uuid_vec_t &content_ids, const LLUUID& response_id, EFetchType fetch_type);

+    void onAISFolderCalback(const LLUUID &request_id, const LLUUID &response_id, EFetchType fetch_type);

+    void bulkFetchViaAis();

+    void bulkFetchViaAis(const FetchQueueInfo& fetch_info);

+    void bulkFetch();

+

+    void backgroundFetch();

+    static void backgroundFetchCB(void*); // background fetch idle function

+

+    bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;

+

+private:

+    bool mRecursiveInventoryFetchStarted;

+    bool mRecursiveLibraryFetchStarted;

+    bool mRecursiveMarketplaceFetchStarted; // AIS3 specific

+    bool mAllRecursiveFoldersFetched;

+    typedef boost::signals2::signal<void()> folders_fetched_signal_t;

+    folders_fetched_signal_t mFoldersFetchedSignal;

+

+    bool mBackgroundFetchActive;

+    bool mFolderFetchActive;

+    S32 mFetchCount;

+    S32 mLastFetchCount; // for debug

+    S32 mFetchFolderCount;

+

+    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?

+};

+

+#endif // LL_LLINVENTORYMODELBACKGROUNDFETCH_H

+