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

diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h
index 4ddff88f66..82239eda4e 100644
--- a/indra/llui/llcontainerview.h
+++ b/indra/llui/llcontainerview.h
@@ -1,94 +1,94 @@
-/** 
- * @file llcontainerview.h
- * @brief Container for all statistics info.
- *
- * $LicenseInfo:firstyear=2001&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_LLCONTAINERVIEW_H
-#define LL_LLCONTAINERVIEW_H
-
-#include "stdtypes.h"
-#include "lltextbox.h"
-#include "llstatbar.h"
-#include "llview.h"
-
-class LLScrollContainer;
-
-struct ContainerViewRegistry : public LLChildRegistry<ContainerViewRegistry>
-{
-	LLSINGLETON_EMPTY_CTOR(ContainerViewRegistry);
-};
-
-class LLContainerView : public LLView
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLView::Params>
-	{
-		Optional<std::string> label;
-		Optional<bool> show_label;
-		Optional<bool> display_children;
-		Params()
-			: label("label"),
-			  show_label("show_label", false),
-			  display_children("display_children", true)
-		{
-			changeDefault(mouse_opaque, false);
-		}
-	};
-
-	// my valid children are stored in this registry
- 	typedef ContainerViewRegistry child_registry_t;
-	
-protected:
-	LLContainerView(const Params& p);
-	friend class LLUICtrlFactory;
-public:
-	~LLContainerView();
-
-	/*virtual*/ bool postBuild();
-	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
-	
-	/*virtual*/ bool handleDoubleClick(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask);
-
-	/*virtual*/ void draw();
-	/*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true);
-	/*virtual*/ LLRect getRequiredRect();	// Return the height of this object, given the set options.
-
-	void setLabel(const std::string& label);
-	void showLabel(bool show) { mShowLabel = show; }
-	void setDisplayChildren(bool displayChildren);
-	bool getDisplayChildren() { return mDisplayChildren; }
-	void setScrollContainer(LLScrollContainer* scroll) {mScrollContainer = scroll;}
-
- private:
-	LLScrollContainer* mScrollContainer;
-	void arrange(S32 width, S32 height, bool called_from_parent = true);
-	bool mShowLabel;
-
-protected:
-	bool mDisplayChildren;
-	std::string mLabel;
-};
-#endif // LL_CONTAINERVIEW_
+/**

+ * @file llcontainerview.h

+ * @brief Container for all statistics info.

+ *

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

+#define LL_LLCONTAINERVIEW_H

+

+#include "stdtypes.h"

+#include "lltextbox.h"

+#include "llstatbar.h"

+#include "llview.h"

+

+class LLScrollContainer;

+

+struct ContainerViewRegistry : public LLChildRegistry<ContainerViewRegistry>

+{

+    LLSINGLETON_EMPTY_CTOR(ContainerViewRegistry);

+};

+

+class LLContainerView : public LLView

+{

+public:

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

+    {

+        Optional<std::string> label;

+        Optional<bool> show_label;

+        Optional<bool> display_children;

+        Params()

+            : label("label"),

+              show_label("show_label", false),

+              display_children("display_children", true)

+        {

+            changeDefault(mouse_opaque, false);

+        }

+    };

+

+    // my valid children are stored in this registry

+    typedef ContainerViewRegistry child_registry_t;

+

+protected:

+    LLContainerView(const Params& p);

+    friend class LLUICtrlFactory;

+public:

+    ~LLContainerView();

+

+    /*virtual*/ bool postBuild();

+    /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);

+

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

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

+    /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask);

+

+    /*virtual*/ void draw();

+    /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true);

+    /*virtual*/ LLRect getRequiredRect();   // Return the height of this object, given the set options.

+

+    void setLabel(const std::string& label);

+    void showLabel(bool show) { mShowLabel = show; }

+    void setDisplayChildren(bool displayChildren);

+    bool getDisplayChildren() { return mDisplayChildren; }

+    void setScrollContainer(LLScrollContainer* scroll) {mScrollContainer = scroll;}

+

+ private:

+    LLScrollContainer* mScrollContainer;

+    void arrange(S32 width, S32 height, bool called_from_parent = true);

+    bool mShowLabel;

+

+protected:

+    bool mDisplayChildren;

+    std::string mLabel;

+};

+#endif // LL_CONTAINERVIEW_