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

diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
index 2b144f03de..86ad1cc2cb 100644
--- a/indra/llui/llconsole.h
+++ b/indra/llui/llconsole.h
@@ -1,156 +1,156 @@
-/** 
- * @file llconsole.h
- * @brief a simple console-style output device
- *
- * $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_LLCONSOLE_H
-#define LL_LLCONSOLE_H
-
-#include "llfixedbuffer.h"
-#include "lluictrl.h"
-#include "v4color.h"
-#include <deque>
-
-class LLSD;
-
-class LLConsole : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>
-{
-public:
-
-	typedef enum e_font_size
-	{
-		MONOSPACE = -1,
-		SMALL = 0,
-		BIG = 1
-	} EFontSize;
-
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<U32>	max_lines;
-		Optional<F32>	persist_time;
-		Optional<S32>	font_size_index;
-		Params()
-		:	max_lines("max_lines", LLUI::getInstance()->mSettingGroups["config"]->getS32("ConsoleMaxLines")),
-			persist_time("persist_time", 0.f), // forever
-			font_size_index("font_size_index")
-		{
-			changeDefault(mouse_opaque, false);
-		}
-	};
-protected:
-	LLConsole(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	// call once per frame to pull data out of LLFixedBuffer
-	static void updateClass();
-
-	//A paragraph color segment defines the color of text in a line 
-	//of text that was received for console display.  It has no 
-	//notion of line wraps, screen position, or the text it contains.
-	//It is only the number of characters that are a color and the
-	//color.
-	struct ParagraphColorSegment
-	{
-		S32		mNumChars;
-		LLColor4 mColor;
-	};
-	
-	//A line color segment is a chunk of text, the color associated
-	//with it, and the X Position it was calculated to begin at 
-	//on the screen.  X Positions are re-calculated if the 
-	//screen changes size.
-	class LineColorSegment
-	{
-		public:
-			LineColorSegment(LLWString text, LLColor4 color, F32 xpos) : mText(text), mColor(color), mXPosition(xpos) {}
-		public:
-			LLWString mText;
-			LLColor4  mColor;
-			F32		  mXPosition;
-	};
-	 	
-	typedef std::list<LineColorSegment> line_color_segments_t;
-	
-	//A line is composed of one or more color segments.
-	class Line
-	{
-		public:
-			line_color_segments_t mLineColorSegments;
-	};
-	
-	typedef std::list<Line> lines_t;
-	typedef std::list<ParagraphColorSegment> paragraph_color_segments_t;
-	
-	//A paragraph is a processed element containing the entire text of the
-	//message (used for recalculating positions on screen resize)
-	//The time this message was added to the console output
-	//The visual screen width of the longest line in this block
-	//And a list of one or more lines which are used to display this message.
-	class Paragraph
-	{
-		public:
-			Paragraph (LLWString str, const LLColor4 &color, F32 add_time, const LLFontGL* font, F32 screen_width);
-			void makeParagraphColorSegments ( const LLColor4 &color);
-			void updateLines ( F32 screen_width,  const LLFontGL* font, bool force_resize=false );
-		public:
-			LLWString mParagraphText;	//The entire text of the paragraph
-			paragraph_color_segments_t	mParagraphColorSegments;
-			F32 mAddTime;				//Time this paragraph was added to the display.
-			F32 mMaxWidth;				//Width of the widest line of text in this paragraph.
-			lines_t	mLines;
-			
-	};
-		
-	//The console contains a deque of paragraphs which represent the individual messages.
-	typedef std::deque<Paragraph> paragraph_t;
-	paragraph_t mParagraphs;
-
-	~LLConsole(){};
-
-	// each line lasts this long after being added
-	void			setLinePersistTime(F32 seconds);
-
-	void			reshape(S32 width, S32 height, bool called_from_parent = true);
-
-	// -1 = monospace, 0 means small, font size = 1 means big
-	void			setFontSize(S32 size_index);
-
-	
-	// Overrides
-	/*virtual*/ void	draw();
-private:
-	void		update();
-
-	F32			mLinePersistTime; // Age at which to stop drawing.
-	F32			mFadeTime; // Age at which to start fading
-	const LLFontGL*	mFont;
-	S32			mConsoleWidth;
-	S32			mConsoleHeight;
-
-};
-
-extern LLConsole* gConsole;
-
-#endif
+/**

+ * @file llconsole.h

+ * @brief a simple console-style output device

+ *

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

+#define LL_LLCONSOLE_H

+

+#include "llfixedbuffer.h"

+#include "lluictrl.h"

+#include "v4color.h"

+#include <deque>

+

+class LLSD;

+

+class LLConsole : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>

+{

+public:

+

+    typedef enum e_font_size

+    {

+        MONOSPACE = -1,

+        SMALL = 0,

+        BIG = 1

+    } EFontSize;

+

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

+    {

+        Optional<U32>   max_lines;

+        Optional<F32>   persist_time;

+        Optional<S32>   font_size_index;

+        Params()

+        :   max_lines("max_lines", LLUI::getInstance()->mSettingGroups["config"]->getS32("ConsoleMaxLines")),

+            persist_time("persist_time", 0.f), // forever

+            font_size_index("font_size_index")

+        {

+            changeDefault(mouse_opaque, false);

+        }

+    };

+protected:

+    LLConsole(const Params&);

+    friend class LLUICtrlFactory;

+

+public:

+    // call once per frame to pull data out of LLFixedBuffer

+    static void updateClass();

+

+    //A paragraph color segment defines the color of text in a line

+    //of text that was received for console display.  It has no

+    //notion of line wraps, screen position, or the text it contains.

+    //It is only the number of characters that are a color and the

+    //color.

+    struct ParagraphColorSegment

+    {

+        S32     mNumChars;

+        LLColor4 mColor;

+    };

+

+    //A line color segment is a chunk of text, the color associated

+    //with it, and the X Position it was calculated to begin at

+    //on the screen.  X Positions are re-calculated if the

+    //screen changes size.

+    class LineColorSegment

+    {

+        public:

+            LineColorSegment(LLWString text, LLColor4 color, F32 xpos) : mText(text), mColor(color), mXPosition(xpos) {}

+        public:

+            LLWString mText;

+            LLColor4  mColor;

+            F32       mXPosition;

+    };

+

+    typedef std::list<LineColorSegment> line_color_segments_t;

+

+    //A line is composed of one or more color segments.

+    class Line

+    {

+        public:

+            line_color_segments_t mLineColorSegments;

+    };

+

+    typedef std::list<Line> lines_t;

+    typedef std::list<ParagraphColorSegment> paragraph_color_segments_t;

+

+    //A paragraph is a processed element containing the entire text of the

+    //message (used for recalculating positions on screen resize)

+    //The time this message was added to the console output

+    //The visual screen width of the longest line in this block

+    //And a list of one or more lines which are used to display this message.

+    class Paragraph

+    {

+        public:

+            Paragraph (LLWString str, const LLColor4 &color, F32 add_time, const LLFontGL* font, F32 screen_width);

+            void makeParagraphColorSegments ( const LLColor4 &color);

+            void updateLines ( F32 screen_width,  const LLFontGL* font, bool force_resize=false );

+        public:

+            LLWString mParagraphText;   //The entire text of the paragraph

+            paragraph_color_segments_t  mParagraphColorSegments;

+            F32 mAddTime;               //Time this paragraph was added to the display.

+            F32 mMaxWidth;              //Width of the widest line of text in this paragraph.

+            lines_t mLines;

+

+    };

+

+    //The console contains a deque of paragraphs which represent the individual messages.

+    typedef std::deque<Paragraph> paragraph_t;

+    paragraph_t mParagraphs;

+

+    ~LLConsole(){};

+

+    // each line lasts this long after being added

+    void            setLinePersistTime(F32 seconds);

+

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

+

+    // -1 = monospace, 0 means small, font size = 1 means big

+    void            setFontSize(S32 size_index);

+

+

+    // Overrides

+    /*virtual*/ void    draw();

+private:

+    void        update();

+

+    F32         mLinePersistTime; // Age at which to stop drawing.

+    F32         mFadeTime; // Age at which to start fading

+    const LLFontGL* mFont;

+    S32         mConsoleWidth;

+    S32         mConsoleHeight;

+

+};

+

+extern LLConsole* gConsole;

+

+#endif