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

diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
index 24bfd993bd..baf57753ae 100644
--- a/indra/llmessage/llxfer_file.h
+++ b/indra/llmessage/llxfer_file.h
@@ -1,87 +1,87 @@
-/** 
- * @file llxfer_file.h
- * @brief definition of LLXfer_File class for a single xfer_file.
- *
- * $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_LLXFER_FILE_H
-#define LL_LLXFER_FILE_H
-
-#include "llxfer.h"
-#include "lldir.h"
-
-class LLXfer_File : public LLXfer
-{
- protected:
- 	LLFILE *mFp;
-	std::string mLocalFilename;
-	std::string mRemoteFilename;
-	ELLPath mRemotePath;
-	std::string mTempFilename;
-
-	bool mDeleteLocalOnCompletion;
-	bool mDeleteRemoteOnCompletion;
-
- public:
-	LLXfer_File (S32 chunk_size);
-	LLXfer_File (const std::string& local_filename, bool delete_local_on_completion, S32 chunk_size);
-	virtual ~LLXfer_File();
-
-	virtual void init(const std::string& local_filename, bool delete_local_on_completion, S32 chunk_size);
-	virtual void cleanup();
-
-	virtual S32 initializeRequest(U64 xfer_id,
-								  const std::string& local_filename,
-								  const std::string& remote_filename,
-								  ELLPath remote_path,
-								  const LLHost& remote_host,
-								  bool delete_remote_on_completion,
-								  void (*callback)(void**,S32,LLExtStat),
-								  void** user_data);
-	virtual S32 startDownload();
-
-	virtual S32 processEOF();
-
-	virtual S32 startSend(U64 xfer_id, const LLHost &remote_host);
-	virtual void closeFileHandle();
-	virtual S32 reopenFileHandle();
-
-	virtual S32 suck(S32 start_position);
-	virtual S32 flush();
-
-	virtual bool matchesLocalFilename(const std::string& filename);
-	virtual bool matchesRemoteFilename(const std::string& filename, ELLPath remote_path);
-
-	virtual S32  getMaxBufferSize();
-
-	virtual U32 getXferTypeTag();
-
-	virtual std::string getFileName();
-};
-
-#endif
-
-
-
-
-
+/**

+ * @file llxfer_file.h

+ * @brief definition of LLXfer_File class for a single xfer_file.

+ *

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

+#define LL_LLXFER_FILE_H

+

+#include "llxfer.h"

+#include "lldir.h"

+

+class LLXfer_File : public LLXfer

+{

+ protected:

+    LLFILE *mFp;

+    std::string mLocalFilename;

+    std::string mRemoteFilename;

+    ELLPath mRemotePath;

+    std::string mTempFilename;

+

+    bool mDeleteLocalOnCompletion;

+    bool mDeleteRemoteOnCompletion;

+

+ public:

+    LLXfer_File (S32 chunk_size);

+    LLXfer_File (const std::string& local_filename, bool delete_local_on_completion, S32 chunk_size);

+    virtual ~LLXfer_File();

+

+    virtual void init(const std::string& local_filename, bool delete_local_on_completion, S32 chunk_size);

+    virtual void cleanup();

+

+    virtual S32 initializeRequest(U64 xfer_id,

+                                  const std::string& local_filename,

+                                  const std::string& remote_filename,

+                                  ELLPath remote_path,

+                                  const LLHost& remote_host,

+                                  bool delete_remote_on_completion,

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

+                                  void** user_data);

+    virtual S32 startDownload();

+

+    virtual S32 processEOF();

+

+    virtual S32 startSend(U64 xfer_id, const LLHost &remote_host);

+    virtual void closeFileHandle();

+    virtual S32 reopenFileHandle();

+

+    virtual S32 suck(S32 start_position);

+    virtual S32 flush();

+

+    virtual bool matchesLocalFilename(const std::string& filename);

+    virtual bool matchesRemoteFilename(const std::string& filename, ELLPath remote_path);

+

+    virtual S32  getMaxBufferSize();

+

+    virtual U32 getXferTypeTag();

+

+    virtual std::string getFileName();

+};

+

+#endif

+

+

+

+

+