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, 144 insertions, 144 deletions

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index 7746ad8c7b..64179487c5 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -1,144 +1,144 @@
-/** 
- * @file llpanelmarketplaceinboxinventory.h
- * @brief LLInboxInventoryPanel class declaration
- *
- * $LicenseInfo:firstyear=2009&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_INBOXINVENTORYPANEL_H
-#define LL_INBOXINVENTORYPANEL_H
-
-
-#include "llbadgeowner.h"
-#include "llinventorypanel.h"
-#include "llfolderviewitem.h"
-
-
-
-
-
-class LLInboxInventoryPanel : public LLInventoryPanel
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLInventoryPanel::Params>
-	{};
-	
-	LLInboxInventoryPanel(const Params& p);
-	~LLInboxInventoryPanel();
-
-	// virtual
-	void initFromParams(const LLInventoryPanel::Params&);
-	LLFolderViewFolder*	createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop);
-	LLFolderViewItem * createFolderViewItem(LLInvFVBridge * bridge);
-
-    void onRemoveItemFreshness(const LLUUID& item_id);
-};
-
-
-class LLInboxFolderViewFolder : public LLFolderViewFolder, public LLBadgeOwner
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>
-	{
-		Optional<LLBadge::Params>	new_badge;
-		
-		Params()
-		:	new_badge("new_badge")
-		{}
-	};
-	
-	LLInboxFolderViewFolder(const Params& p);
-	
-    void addItem(LLFolderViewItem* item);
-	void draw();
-	
-	bool handleMouseDown(S32 x, S32 y, MASK mask);
-	bool handleDoubleClick(S32 x, S32 y, MASK mask);
-	void selectItem();
-
-	void computeFreshness();
-	void deFreshify();
-
-	bool isFresh() const { return mFresh; }
-    void setFresh(bool is_fresh)  { mFresh = is_fresh; }
-	
-protected:
-	bool mFresh;
-};
-
-
-class LLInboxFolderViewItem : public LLFolderViewItem, public LLBadgeOwner
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLFolderViewItem::Params>
-	{
-		Optional<LLBadge::Params>	new_badge;
-
-		Params()
-		:	new_badge("new_badge")
-		{}
-	};
-
-	LLInboxFolderViewItem(const Params& p);
-
-	void addToFolder(LLFolderViewFolder* folder);
-	bool handleDoubleClick(S32 x, S32 y, MASK mask);
-
-	void draw();
-
-	void selectItem();
-
-	void computeFreshness();
-	void deFreshify();
-
-	bool isFresh() const { return mFresh; }
-    void setFresh(bool is_fresh)  { mFresh = is_fresh; }
-
-protected:
-	bool mFresh;
-};
-
-class LLInboxNewItemsStorage : public LLSingleton<LLInboxNewItemsStorage>
-	, public LLDestroyClass<LLInboxNewItemsStorage>
-{
-	LLSINGLETON(LLInboxNewItemsStorage);
-	LOG_CLASS(LLInboxNewItemsStorage);
-public:
-	static void destroyClass();
-	void saveNewItemsIds();
-
-	void load();
-	
-	void addFreshItem(const LLUUID& id) { mNewItemsIDs.insert(id); }
-    void removeItem(const LLUUID& id);
-	bool isItemFresh(const LLUUID& id) { return (mNewItemsIDs.find(id) != mNewItemsIDs.end()); }
-
-    void addInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.insert(inbox); }
-    void removeInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.erase(inbox); }
-
-private:
-	std::set<LLUUID> mNewItemsIDs;
-
-    std::set<LLInboxInventoryPanel*> mInboxPanels;
-};
-
-#endif //LL_INBOXINVENTORYPANEL_H
+/**

+ * @file llpanelmarketplaceinboxinventory.h

+ * @brief LLInboxInventoryPanel class declaration

+ *

+ * $LicenseInfo:firstyear=2009&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_INBOXINVENTORYPANEL_H

+#define LL_INBOXINVENTORYPANEL_H

+

+

+#include "llbadgeowner.h"

+#include "llinventorypanel.h"

+#include "llfolderviewitem.h"

+

+

+

+

+

+class LLInboxInventoryPanel : public LLInventoryPanel

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLInventoryPanel::Params>

+    {};

+

+    LLInboxInventoryPanel(const Params& p);

+    ~LLInboxInventoryPanel();

+

+    // virtual

+    void initFromParams(const LLInventoryPanel::Params&);

+    LLFolderViewFolder* createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop);

+    LLFolderViewItem * createFolderViewItem(LLInvFVBridge * bridge);

+

+    void onRemoveItemFreshness(const LLUUID& item_id);

+};

+

+

+class LLInboxFolderViewFolder : public LLFolderViewFolder, public LLBadgeOwner

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>

+    {

+        Optional<LLBadge::Params>   new_badge;

+

+        Params()

+        :   new_badge("new_badge")

+        {}

+    };

+

+    LLInboxFolderViewFolder(const Params& p);

+

+    void addItem(LLFolderViewItem* item);

+    void draw();

+

+    bool handleMouseDown(S32 x, S32 y, MASK mask);

+    bool handleDoubleClick(S32 x, S32 y, MASK mask);

+    void selectItem();

+

+    void computeFreshness();

+    void deFreshify();

+

+    bool isFresh() const { return mFresh; }

+    void setFresh(bool is_fresh)  { mFresh = is_fresh; }

+

+protected:

+    bool mFresh;

+};

+

+

+class LLInboxFolderViewItem : public LLFolderViewItem, public LLBadgeOwner

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLFolderViewItem::Params>

+    {

+        Optional<LLBadge::Params>   new_badge;

+

+        Params()

+        :   new_badge("new_badge")

+        {}

+    };

+

+    LLInboxFolderViewItem(const Params& p);

+

+    void addToFolder(LLFolderViewFolder* folder);

+    bool handleDoubleClick(S32 x, S32 y, MASK mask);

+

+    void draw();

+

+    void selectItem();

+

+    void computeFreshness();

+    void deFreshify();

+

+    bool isFresh() const { return mFresh; }

+    void setFresh(bool is_fresh)  { mFresh = is_fresh; }

+

+protected:

+    bool mFresh;

+};

+

+class LLInboxNewItemsStorage : public LLSingleton<LLInboxNewItemsStorage>

+    , public LLDestroyClass<LLInboxNewItemsStorage>

+{

+    LLSINGLETON(LLInboxNewItemsStorage);

+    LOG_CLASS(LLInboxNewItemsStorage);

+public:

+    static void destroyClass();

+    void saveNewItemsIds();

+

+    void load();

+

+    void addFreshItem(const LLUUID& id) { mNewItemsIDs.insert(id); }

+    void removeItem(const LLUUID& id);

+    bool isItemFresh(const LLUUID& id) { return (mNewItemsIDs.find(id) != mNewItemsIDs.end()); }

+

+    void addInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.insert(inbox); }

+    void removeInboxPanel(LLInboxInventoryPanel* inbox) { mInboxPanels.erase(inbox); }

+

+private:

+    std::set<LLUUID> mNewItemsIDs;

+

+    std::set<LLInboxInventoryPanel*> mInboxPanels;

+};

+

+#endif //LL_INBOXINVENTORYPANEL_H