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

diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h
index a873026fa4..b6040b0a35 100644
--- a/indra/llmessage/net.h
+++ b/indra/llmessage/net.h
@@ -1,74 +1,74 @@
-/** 
- * @file net.h
- * @brief Cross platform UDP network code.
- *
- * $LicenseInfo:firstyear=2000&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_NET_H					
-#define LL_NET_H
-
-class LLTimer;
-class LLHost;
-
-#define NET_BUFFER_SIZE (0x2000)
-
-// Request a free local port from the operating system
-#define NET_USE_OS_ASSIGNED_PORT 0
-
-// Returns 0 on success, non-zero on error.
-// Sets socket handler/descriptor, changes nPort if port requested is unavailable.
-S32		start_net(S32& socket_out, int& nPort);								
-void	end_net(S32& socket_out);
-
-// returns size of packet or -1 in case of error
-S32		receive_packet(int hSocket, char * receiveBuffer);
-
-bool	send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort);	// Returns true on success.
-
-//void	get_sender(char * tmp);
-LLHost	get_sender();
-U32		get_sender_port();
-U32		get_sender_ip(void);
-LLHost	get_receiving_interface();
-U32		get_receiving_interface_ip(void);
-
-const char*	u32_to_ip_string(U32 ip);					// Returns pointer to internal string buffer, "(bad IP addr)" on failure, cannot nest calls 
-char*		u32_to_ip_string(U32 ip, char *ip_string);	// NULL on failure, ip_string on success, you must allocate at least MAXADDRSTR chars
-U32			ip_string_to_u32(const char* ip_string);	// Wrapper for inet_addr()
-
-extern const char* LOOPBACK_ADDRESS_STRING;
-extern const char* BROADCAST_ADDRESS_STRING;
-
-
-// useful MTU consts
-
-const S32	MTUBYTES = 1200;	// 1500 = standard Ethernet MTU
-const S32	ETHERNET_MTU_BYTES = 1500;
-const S32	MTUBITS = MTUBYTES*8;
-const S32	MTUU32S = MTUBITS/32;
-
-// For automatic port discovery when running multiple viewers on one host
-const	U32		PORT_DISCOVERY_RANGE_MIN		= 13000;
-const	U32		PORT_DISCOVERY_RANGE_MAX		= PORT_DISCOVERY_RANGE_MIN + 50;
-
-#endif
+/**

+ * @file net.h

+ * @brief Cross platform UDP network code.

+ *

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

+#define LL_NET_H

+

+class LLTimer;

+class LLHost;

+

+#define NET_BUFFER_SIZE (0x2000)

+

+// Request a free local port from the operating system

+#define NET_USE_OS_ASSIGNED_PORT 0

+

+// Returns 0 on success, non-zero on error.

+// Sets socket handler/descriptor, changes nPort if port requested is unavailable.

+S32     start_net(S32& socket_out, int& nPort);

+void    end_net(S32& socket_out);

+

+// returns size of packet or -1 in case of error

+S32     receive_packet(int hSocket, char * receiveBuffer);

+

+bool    send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort);   // Returns true on success.

+

+//void  get_sender(char * tmp);

+LLHost  get_sender();

+U32     get_sender_port();

+U32     get_sender_ip(void);

+LLHost  get_receiving_interface();

+U32     get_receiving_interface_ip(void);

+

+const char* u32_to_ip_string(U32 ip);                   // Returns pointer to internal string buffer, "(bad IP addr)" on failure, cannot nest calls

+char*       u32_to_ip_string(U32 ip, char *ip_string);  // NULL on failure, ip_string on success, you must allocate at least MAXADDRSTR chars

+U32         ip_string_to_u32(const char* ip_string);    // Wrapper for inet_addr()

+

+extern const char* LOOPBACK_ADDRESS_STRING;

+extern const char* BROADCAST_ADDRESS_STRING;

+

+

+// useful MTU consts

+

+const S32   MTUBYTES = 1200;    // 1500 = standard Ethernet MTU

+const S32   ETHERNET_MTU_BYTES = 1500;

+const S32   MTUBITS = MTUBYTES*8;

+const S32   MTUU32S = MTUBITS/32;

+

+// For automatic port discovery when running multiple viewers on one host

+const   U32     PORT_DISCOVERY_RANGE_MIN        = 13000;

+const   U32     PORT_DISCOVERY_RANGE_MAX        = PORT_DISCOVERY_RANGE_MIN + 50;

+

+#endif