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

diff --git a/indra/llmessage/llpacketack.h b/indra/llmessage/llpacketack.h
index 76e2e43acb..c359ec2c0e 100644
--- a/indra/llmessage/llpacketack.h
+++ b/indra/llmessage/llpacketack.h
@@ -1,116 +1,116 @@
-/** 
- * @file llpacketack.h
- * @brief Reliable UDP helpers for the message system.
- *
- * $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_LLPACKETACK_H
-#define LL_LLPACKETACK_H
-
-#include "llhost.h"
-#include "llunits.h"
-
-class LLReliablePacketParams
-{
-public:
-	LLHost mHost;
-	S32 mRetries;
-	bool mPingBasedRetry;
-	F32Seconds mTimeout;
-	void (*mCallback)(void **,S32);
-	void** mCallbackData;
-	char* mMessageName;
-
-public:
-	LLReliablePacketParams()
-	{
-		clear();
-	};
-
-	~LLReliablePacketParams() { };
-
-	void clear()
-	{
-		mHost.invalidate();
-		mRetries = 0;
-		mPingBasedRetry = true;
-		mTimeout = F32Seconds(0.f);
-		mCallback = NULL;
-		mCallbackData = NULL;
-		mMessageName = NULL;
-	};
-
-	void set(
-		const LLHost& host,
-		S32 retries,
-		bool ping_based_retry,
-		F32Seconds timeout, 
-		void (*callback)(void**,S32),
-		void** callback_data, char* name)
-	{
-		mHost = host;
-		mRetries = retries;
-		mPingBasedRetry = ping_based_retry;
-		mTimeout = timeout;
-		mCallback = callback;
-		mCallbackData = callback_data;
-		mMessageName = name;
-	};
-};
-
-class LLReliablePacket
-{
-public:
-	LLReliablePacket(
-		S32 socket,
-		U8* buf_ptr,
-		S32 buf_len,
-		LLReliablePacketParams* params);
-	~LLReliablePacket()
-	{ 
-		mCallback = NULL;
-		delete [] mBuffer;
-		mBuffer = NULL;
-	};
-
-	friend class LLCircuitData;
-protected:
-	S32 mSocket;
-	LLHost mHost;
-	S32 mRetries;
-	bool mPingBasedRetry;
-	F32Seconds mTimeout;
-	void (*mCallback)(void**,S32);
-	void** mCallbackData;
-	char* mMessageName;
-
-	U8* mBuffer;
-	S32 mBufferLength;
-
-	TPACKETID mPacketID;
-
-	F64Seconds mExpirationTime;
-};
-
-#endif
-
+/**

+ * @file llpacketack.h

+ * @brief Reliable UDP helpers for the message system.

+ *

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

+#define LL_LLPACKETACK_H

+

+#include "llhost.h"

+#include "llunits.h"

+

+class LLReliablePacketParams

+{

+public:

+    LLHost mHost;

+    S32 mRetries;

+    bool mPingBasedRetry;

+    F32Seconds mTimeout;

+    void (*mCallback)(void **,S32);

+    void** mCallbackData;

+    char* mMessageName;

+

+public:

+    LLReliablePacketParams()

+    {

+        clear();

+    };

+

+    ~LLReliablePacketParams() { };

+

+    void clear()

+    {

+        mHost.invalidate();

+        mRetries = 0;

+        mPingBasedRetry = true;

+        mTimeout = F32Seconds(0.f);

+        mCallback = NULL;

+        mCallbackData = NULL;

+        mMessageName = NULL;

+    };

+

+    void set(

+        const LLHost& host,

+        S32 retries,

+        bool ping_based_retry,

+        F32Seconds timeout,

+        void (*callback)(void**,S32),

+        void** callback_data, char* name)

+    {

+        mHost = host;

+        mRetries = retries;

+        mPingBasedRetry = ping_based_retry;

+        mTimeout = timeout;

+        mCallback = callback;

+        mCallbackData = callback_data;

+        mMessageName = name;

+    };

+};

+

+class LLReliablePacket

+{

+public:

+    LLReliablePacket(

+        S32 socket,

+        U8* buf_ptr,

+        S32 buf_len,

+        LLReliablePacketParams* params);

+    ~LLReliablePacket()

+    {

+        mCallback = NULL;

+        delete [] mBuffer;

+        mBuffer = NULL;

+    };

+

+    friend class LLCircuitData;

+protected:

+    S32 mSocket;

+    LLHost mHost;

+    S32 mRetries;

+    bool mPingBasedRetry;

+    F32Seconds mTimeout;

+    void (*mCallback)(void**,S32);

+    void** mCallbackData;

+    char* mMessageName;

+

+    U8* mBuffer;

+    S32 mBufferLength;

+

+    TPACKETID mPacketID;

+

+    F64Seconds mExpirationTime;

+};

+

+#endif

+