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

diff --git a/indra/llmessage/lltemplatemessagebuilder.h b/indra/llmessage/lltemplatemessagebuilder.h
index f02ed0c06d..bb50b0ab8a 100644
--- a/indra/llmessage/lltemplatemessagebuilder.h
+++ b/indra/llmessage/lltemplatemessagebuilder.h
@@ -1,115 +1,115 @@
-/** 
- * @file lltemplatemessagebuilder.h
- * @brief Declaration of LLTemplateMessageBuilder class.
- *
- * $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_LLTEMPLATEMESSAGEBUILDER_H
-#define LL_LLTEMPLATEMESSAGEBUILDER_H
-
-#include <map>
-
-#include "llmessagebuilder.h"
-#include "llmsgvariabletype.h"
-
-class LLMsgData;
-class LLMessageTemplate;
-class LLMsgBlkData;
-class LLMessageTemplate;
-
-class LLTemplateMessageBuilder : public LLMessageBuilder
-{
-public:
-	
-	typedef std::map<const char* , LLMessageTemplate*> message_template_name_map_t;
-
-	LLTemplateMessageBuilder(const message_template_name_map_t&);
-	virtual ~LLTemplateMessageBuilder();
-
-	virtual void newMessage(const char* name);
-
-	virtual void nextBlock(const char* blockname);
-	virtual bool removeLastBlock(); // TODO: babbage: remove this horror...
-
-	/** All add* methods expect pointers to canonical varname strings. */
-	virtual void addBinaryData(const char *varname, const void *data, 
-							   S32 size);
-	virtual void addBOOL(const char* varname, bool b);
-	virtual void addS8(const char* varname, S8 s);
-	virtual void addU8(const char* varname, U8 u);
-	virtual void addS16(const char* varname, S16 i);
-	virtual void addU16(const char* varname, U16 i);
-	virtual void addF32(const char* varname, F32 f);
-	virtual void addS32(const char* varname, S32 s);
-	virtual void addU32(const char* varname, U32 u);
-	virtual void addU64(const char* varname, U64 lu);
-	virtual void addF64(const char* varname, F64 d);
-	virtual void addVector3(const char* varname, const LLVector3& vec);
-	virtual void addVector4(const char* varname, const LLVector4& vec);
-	virtual void addVector3d(const char* varname, const LLVector3d& vec);
-	virtual void addQuat(const char* varname, const LLQuaternion& quat);
-	virtual void addUUID(const char* varname, const LLUUID& uuid);
-	virtual void addIPAddr(const char* varname, const U32 ip);
-	virtual void addIPPort(const char* varname, const U16 port);
-	virtual void addString(const char* varname, const char* s);
-	virtual void addString(const char* varname, const std::string& s);
-
-	virtual bool isMessageFull(const char* blockname) const;
-	virtual void compressMessage(U8*& buf_ptr, U32& buffer_length);
-
-	virtual bool isBuilt() const;
-	virtual bool isClear() const;
-	virtual U32 buildMessage(U8* buffer, U32 buffer_size, U8 offset_to_data);
-        /**< Return built message size */
-	
-	virtual void clearMessage();
-
-	// TODO: babbage: remove this horror.
-	virtual void setBuilt(bool b);
-
-	virtual S32 getMessageSize();
-	virtual const char* getMessageName() const;
-
-	virtual void copyFromMessageData(const LLMsgData& data);
-	virtual void copyFromLLSD(const LLSD&);
-
-	LLMsgData* getCurrentMessage() const { return mCurrentSMessageData; }
-private:
-	void addData(const char* varname, const void* data, 
-					 EMsgVariableType type, S32 size);
-	
-	void addData(const char* varname, const void* data, 
-						EMsgVariableType type);
-
-	LLMsgData* mCurrentSMessageData;
-	const LLMessageTemplate* mCurrentSMessageTemplate;
-	LLMsgBlkData* mCurrentSDataBlock;
-	char* mCurrentSMessageName;
-	char* mCurrentSBlockName;
-	bool mbSBuilt;
-	bool mbSClear;
-	S32	 mCurrentSendTotal;
-	const message_template_name_map_t& mMessageTemplates;
-};
-
-#endif // LL_LLTEMPLATEMESSAGEBUILDER_H
+/**

+ * @file lltemplatemessagebuilder.h

+ * @brief Declaration of LLTemplateMessageBuilder class.

+ *

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

+#define LL_LLTEMPLATEMESSAGEBUILDER_H

+

+#include <map>

+

+#include "llmessagebuilder.h"

+#include "llmsgvariabletype.h"

+

+class LLMsgData;

+class LLMessageTemplate;

+class LLMsgBlkData;

+class LLMessageTemplate;

+

+class LLTemplateMessageBuilder : public LLMessageBuilder

+{

+public:

+

+    typedef std::map<const char* , LLMessageTemplate*> message_template_name_map_t;

+

+    LLTemplateMessageBuilder(const message_template_name_map_t&);

+    virtual ~LLTemplateMessageBuilder();

+

+    virtual void newMessage(const char* name);

+

+    virtual void nextBlock(const char* blockname);

+    virtual bool removeLastBlock(); // TODO: babbage: remove this horror...

+

+    /** All add* methods expect pointers to canonical varname strings. */

+    virtual void addBinaryData(const char *varname, const void *data,

+                               S32 size);

+    virtual void addBOOL(const char* varname, bool b);

+    virtual void addS8(const char* varname, S8 s);

+    virtual void addU8(const char* varname, U8 u);

+    virtual void addS16(const char* varname, S16 i);

+    virtual void addU16(const char* varname, U16 i);

+    virtual void addF32(const char* varname, F32 f);

+    virtual void addS32(const char* varname, S32 s);

+    virtual void addU32(const char* varname, U32 u);

+    virtual void addU64(const char* varname, U64 lu);

+    virtual void addF64(const char* varname, F64 d);

+    virtual void addVector3(const char* varname, const LLVector3& vec);

+    virtual void addVector4(const char* varname, const LLVector4& vec);

+    virtual void addVector3d(const char* varname, const LLVector3d& vec);

+    virtual void addQuat(const char* varname, const LLQuaternion& quat);

+    virtual void addUUID(const char* varname, const LLUUID& uuid);

+    virtual void addIPAddr(const char* varname, const U32 ip);

+    virtual void addIPPort(const char* varname, const U16 port);

+    virtual void addString(const char* varname, const char* s);

+    virtual void addString(const char* varname, const std::string& s);

+

+    virtual bool isMessageFull(const char* blockname) const;

+    virtual void compressMessage(U8*& buf_ptr, U32& buffer_length);

+

+    virtual bool isBuilt() const;

+    virtual bool isClear() const;

+    virtual U32 buildMessage(U8* buffer, U32 buffer_size, U8 offset_to_data);

+        /**< Return built message size */

+

+    virtual void clearMessage();

+

+    // TODO: babbage: remove this horror.

+    virtual void setBuilt(bool b);

+

+    virtual S32 getMessageSize();

+    virtual const char* getMessageName() const;

+

+    virtual void copyFromMessageData(const LLMsgData& data);

+    virtual void copyFromLLSD(const LLSD&);

+

+    LLMsgData* getCurrentMessage() const { return mCurrentSMessageData; }

+private:

+    void addData(const char* varname, const void* data,

+                     EMsgVariableType type, S32 size);

+

+    void addData(const char* varname, const void* data,

+                        EMsgVariableType type);

+

+    LLMsgData* mCurrentSMessageData;

+    const LLMessageTemplate* mCurrentSMessageTemplate;

+    LLMsgBlkData* mCurrentSDataBlock;

+    char* mCurrentSMessageName;

+    char* mCurrentSBlockName;

+    bool mbSBuilt;

+    bool mbSClear;

+    S32  mCurrentSendTotal;

+    const message_template_name_map_t& mMessageTemplates;

+};

+

+#endif // LL_LLTEMPLATEMESSAGEBUILDER_H