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

diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
index 888ee927b5..64f9f937af 100644
--- a/indra/llmessage/llpacketring.h
+++ b/indra/llmessage/llpacketring.h
@@ -1,101 +1,101 @@
-/** 
- * @file llpacketring.h
- * @brief definition of LLPacketRing class for implementing a resend,
- * drop, or delay in packet transmissions
- *
- * $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_LLPACKETRING_H
-#define LL_LLPACKETRING_H
-
-#include <queue>
-
-#include "llhost.h"
-#include "llpacketbuffer.h"
-#include "llproxy.h"
-#include "llthrottle.h"
-#include "net.h"
-
-class LLPacketRing
-{
-public:
-	LLPacketRing();         
-    ~LLPacketRing();
-
-	void cleanup();
-
-	void dropPackets(U32);	
-	void setDropPercentage (F32 percent_to_drop);
-	void setUseInThrottle(const bool use_throttle);
-	void setUseOutThrottle(const bool use_throttle);
-	void setInBandwidth(const F32 bps);
-	void setOutBandwidth(const F32 bps);
-	S32  receivePacket (S32 socket, char *datap);
-	S32  receiveFromRing (S32 socket, char *datap);
-
-	bool sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host);
-
-	inline LLHost getLastSender();
-	inline LLHost getLastReceivingInterface();
-
-	S32 getAndResetActualInBits()				{ S32 bits = mActualBitsIn; mActualBitsIn = 0; return bits;}
-	S32 getAndResetActualOutBits()				{ S32 bits = mActualBitsOut; mActualBitsOut = 0; return bits;}
-protected:
-	bool mUseInThrottle;
-	bool mUseOutThrottle;
-	
-	// For simulating a lower-bandwidth connection - BPS
-	LLThrottle mInThrottle;
-	LLThrottle mOutThrottle;
-
-	S32 mActualBitsIn;
-	S32 mActualBitsOut;
-	S32 mMaxBufferLength;			// How much data can we queue up before dropping data.
-	S32 mInBufferLength;			// Current incoming buffer length
-	S32 mOutBufferLength;			// Current outgoing buffer length
-
-	F32 mDropPercentage;			// % of packets to drop
-	U32 mPacketsToDrop;				// drop next n packets
-
-	std::queue<LLPacketBuffer *> mReceiveQueue;
-	std::queue<LLPacketBuffer *> mSendQueue;
-
-	LLHost mLastSender;
-	LLHost mLastReceivingIF;
-
-private:
-	bool sendPacketImpl(int h_socket, const char * send_buffer, S32 buf_size, LLHost host);
-};
-
-
-inline LLHost LLPacketRing::getLastSender()
-{
-	return mLastSender;
-}
-
-inline LLHost LLPacketRing::getLastReceivingInterface()
-{
-	return mLastReceivingIF;
-}
-
-#endif
+/**

+ * @file llpacketring.h

+ * @brief definition of LLPacketRing class for implementing a resend,

+ * drop, or delay in packet transmissions

+ *

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

+#define LL_LLPACKETRING_H

+

+#include <queue>

+

+#include "llhost.h"

+#include "llpacketbuffer.h"

+#include "llproxy.h"

+#include "llthrottle.h"

+#include "net.h"

+

+class LLPacketRing

+{

+public:

+    LLPacketRing();

+    ~LLPacketRing();

+

+    void cleanup();

+

+    void dropPackets(U32);

+    void setDropPercentage (F32 percent_to_drop);

+    void setUseInThrottle(const bool use_throttle);

+    void setUseOutThrottle(const bool use_throttle);

+    void setInBandwidth(const F32 bps);

+    void setOutBandwidth(const F32 bps);

+    S32  receivePacket (S32 socket, char *datap);

+    S32  receiveFromRing (S32 socket, char *datap);

+

+    bool sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host);

+

+    inline LLHost getLastSender();

+    inline LLHost getLastReceivingInterface();

+

+    S32 getAndResetActualInBits()               { S32 bits = mActualBitsIn; mActualBitsIn = 0; return bits;}

+    S32 getAndResetActualOutBits()              { S32 bits = mActualBitsOut; mActualBitsOut = 0; return bits;}

+protected:

+    bool mUseInThrottle;

+    bool mUseOutThrottle;

+

+    // For simulating a lower-bandwidth connection - BPS

+    LLThrottle mInThrottle;

+    LLThrottle mOutThrottle;

+

+    S32 mActualBitsIn;

+    S32 mActualBitsOut;

+    S32 mMaxBufferLength;           // How much data can we queue up before dropping data.

+    S32 mInBufferLength;            // Current incoming buffer length

+    S32 mOutBufferLength;           // Current outgoing buffer length

+

+    F32 mDropPercentage;            // % of packets to drop

+    U32 mPacketsToDrop;             // drop next n packets

+

+    std::queue<LLPacketBuffer *> mReceiveQueue;

+    std::queue<LLPacketBuffer *> mSendQueue;

+

+    LLHost mLastSender;

+    LLHost mLastReceivingIF;

+

+private:

+    bool sendPacketImpl(int h_socket, const char * send_buffer, S32 buf_size, LLHost host);

+};

+

+

+inline LLHost LLPacketRing::getLastSender()

+{

+    return mLastSender;

+}

+

+inline LLHost LLPacketRing::getLastReceivingInterface()

+{

+    return mLastReceivingIF;

+}

+

+#endif