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

diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
index 4119de6009..510730c115 100644
--- a/indra/llmessage/llsdmessagereader.h
+++ b/indra/llmessage/llsdmessagereader.h
@@ -1,108 +1,108 @@
-/** 
- * @file llsdmessagereader.h
- * @brief LLSDMessageReader class Declaration
- *
- * $LicenseInfo:firstyear=2007&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_LLSDMESSAGEREADER_H
-#define LL_LLSDMESSAGEREADER_H
-
-#include "llmessagereader.h"
-#include "llsd.h"
-
-#include <map>
-
-class LLMessageTemplate;
-class LLMsgData;
-
-class LLSDMessageReader : public LLMessageReader
-{
-public:
-
-	LLSDMessageReader();
-	virtual ~LLSDMessageReader();
-
-	/** All get* methods expect pointers to canonical strings. */
-	virtual void getBinaryData(const char *block, const char *var, 
-							   void *datap, S32 size, S32 blocknum = 0, 
-							   S32 max_size = S32_MAX);
-	virtual void getBOOL(const char *block, const char *var, bool &data,
-						 S32 blocknum = 0);
-	virtual void getS8(const char *block, const char *var, S8 &data, 
-					   S32 blocknum = 0);
-	virtual void getU8(const char *block, const char *var, U8 &data, 
-					   S32 blocknum = 0);
-	virtual void getS16(const char *block, const char *var, S16 &data, 
-						S32 blocknum = 0);
-	virtual void getU16(const char *block, const char *var, U16 &data, 
-						S32 blocknum = 0);
-	virtual void getS32(const char *block, const char *var, S32 &data, 
-						S32 blocknum = 0);
-	virtual void getF32(const char *block, const char *var, F32 &data, 
-						S32 blocknum = 0);
-	virtual void getU32(const char *block, const char *var, U32 &data, 
-						S32 blocknum = 0);
-	virtual void getU64(const char *block, const char *var, U64 &data, 
-						S32 blocknum = 0);
-	virtual void getF64(const char *block, const char *var, F64 &data, 
-						S32 blocknum = 0);
-	virtual void getVector3(const char *block, const char *var, 
-							LLVector3 &vec, S32 blocknum = 0);
-	virtual void getVector4(const char *block, const char *var, 
-							LLVector4 &vec, S32 blocknum = 0);
-	virtual void getVector3d(const char *block, const char *var, 
-							 LLVector3d &vec, S32 blocknum = 0);
-	virtual void getQuat(const char *block, const char *var, LLQuaternion &q, 
-						 S32 blocknum = 0);
-	virtual void getUUID(const char *block, const char *var, LLUUID &uuid, 
-						 S32 blocknum = 0);
-	virtual void getIPAddr(const char *block, const char *var, U32 &ip, 
-						   S32 blocknum = 0);
-	virtual void getIPPort(const char *block, const char *var, U16 &port, 
-						   S32 blocknum = 0);
-	virtual void getString(const char *block, const char *var, 
-						   S32 buffer_size, char *buffer, S32 blocknum = 0);
-	virtual void getString(const char *block, const char *var, std::string& outstr,
-						   S32 blocknum = 0);
-
-	virtual S32	getNumberOfBlocks(const char *blockname);
-	virtual S32	getSize(const char *blockname, const char *varname);
-	virtual S32	getSize(const char *blockname, S32 blocknum, 
-						const char *varname);
-
-	virtual void clearMessage();
-
-	virtual const char* getMessageName() const;
-	virtual S32 getMessageSize() const;
-
-	virtual void copyToBuilder(LLMessageBuilder&) const;
-
-	/** Expects a pointer to a canonical name string */
-	void setMessage(const char* name, const LLSD& msg);
-
-private:
-	const char* mMessageName; // Canonical (prehashed) string.
-	LLSD mMessage;
-};
-
-#endif // LL_LLSDMESSAGEREADER_H
+/**

+ * @file llsdmessagereader.h

+ * @brief LLSDMessageReader class Declaration

+ *

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

+#define LL_LLSDMESSAGEREADER_H

+

+#include "llmessagereader.h"

+#include "llsd.h"

+

+#include <map>

+

+class LLMessageTemplate;

+class LLMsgData;

+

+class LLSDMessageReader : public LLMessageReader

+{

+public:

+

+    LLSDMessageReader();

+    virtual ~LLSDMessageReader();

+

+    /** All get* methods expect pointers to canonical strings. */

+    virtual void getBinaryData(const char *block, const char *var,

+                               void *datap, S32 size, S32 blocknum = 0,

+                               S32 max_size = S32_MAX);

+    virtual void getBOOL(const char *block, const char *var, bool &data,

+                         S32 blocknum = 0);

+    virtual void getS8(const char *block, const char *var, S8 &data,

+                       S32 blocknum = 0);

+    virtual void getU8(const char *block, const char *var, U8 &data,

+                       S32 blocknum = 0);

+    virtual void getS16(const char *block, const char *var, S16 &data,

+                        S32 blocknum = 0);

+    virtual void getU16(const char *block, const char *var, U16 &data,

+                        S32 blocknum = 0);

+    virtual void getS32(const char *block, const char *var, S32 &data,

+                        S32 blocknum = 0);

+    virtual void getF32(const char *block, const char *var, F32 &data,

+                        S32 blocknum = 0);

+    virtual void getU32(const char *block, const char *var, U32 &data,

+                        S32 blocknum = 0);

+    virtual void getU64(const char *block, const char *var, U64 &data,

+                        S32 blocknum = 0);

+    virtual void getF64(const char *block, const char *var, F64 &data,

+                        S32 blocknum = 0);

+    virtual void getVector3(const char *block, const char *var,

+                            LLVector3 &vec, S32 blocknum = 0);

+    virtual void getVector4(const char *block, const char *var,

+                            LLVector4 &vec, S32 blocknum = 0);

+    virtual void getVector3d(const char *block, const char *var,

+                             LLVector3d &vec, S32 blocknum = 0);

+    virtual void getQuat(const char *block, const char *var, LLQuaternion &q,

+                         S32 blocknum = 0);

+    virtual void getUUID(const char *block, const char *var, LLUUID &uuid,

+                         S32 blocknum = 0);

+    virtual void getIPAddr(const char *block, const char *var, U32 &ip,

+                           S32 blocknum = 0);

+    virtual void getIPPort(const char *block, const char *var, U16 &port,

+                           S32 blocknum = 0);

+    virtual void getString(const char *block, const char *var,

+                           S32 buffer_size, char *buffer, S32 blocknum = 0);

+    virtual void getString(const char *block, const char *var, std::string& outstr,

+                           S32 blocknum = 0);

+

+    virtual S32 getNumberOfBlocks(const char *blockname);

+    virtual S32 getSize(const char *blockname, const char *varname);

+    virtual S32 getSize(const char *blockname, S32 blocknum,

+                        const char *varname);

+

+    virtual void clearMessage();

+

+    virtual const char* getMessageName() const;

+    virtual S32 getMessageSize() const;

+

+    virtual void copyToBuilder(LLMessageBuilder&) const;

+

+    /** Expects a pointer to a canonical name string */

+    void setMessage(const char* name, const LLSD& msg);

+

+private:

+    const char* mMessageName; // Canonical (prehashed) string.

+    LLSD mMessage;

+};

+

+#endif // LL_LLSDMESSAGEREADER_H