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

diff --git a/indra/newview/llagentpilot.h b/indra/newview/llagentpilot.h
index fcfb051dd9..c2051bbe15 100644
--- a/indra/newview/llagentpilot.h
+++ b/indra/newview/llagentpilot.h
@@ -1,122 +1,122 @@
-/** 
- * @file llagentpilot.h
- * @brief LLAgentPilot class definition
- *
- * $LicenseInfo:firstyear=2002&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_LLAGENTPILOT_H
-#define LL_LLAGENTPILOT_H
-
-#include "stdtypes.h"
-#include "lltimer.h"
-#include "v3dmath.h"
-
-// Class that drives the agent around according to a "script".
-
-class LLAgentPilot
-{
-public:
-	enum EActionType
-	{
-		STRAIGHT,
-		TURN
-	};
-
-	LLAgentPilot();
-	virtual ~LLAgentPilot();
-
-	void load();
-	void loadTxt(const std::string& filename);
-	void loadXML(const std::string& filename);
-	void save();
-	void saveTxt(const std::string& filename);
-	void saveXML(const std::string& filename);
-
-	void startRecord();
-	void stopRecord();
-	void addAction(enum EActionType action);
-
-	void startPlayback();
-	void stopPlayback();
-
-	bool isRecording() { return mRecording; }
-	bool isPlaying() { return mPlaying; }
-	bool getOverrideCamera() { return mOverrideCamera; }
-	
-	void updateTarget();
-
-	void addWaypoint();
-	void moveCamera();
-
-	void setReplaySession(bool new_val) { mReplaySession = new_val; }
-	bool getReplaySession() { return mReplaySession; }
-
-	void setLoop(bool new_val) { mLoop = new_val; }
-	bool getLoop() { return mLoop; }
-
-	void setQuitAfterRuns(bool quit_val) { mQuitAfterRuns = quit_val; }
-	void setNumRuns(S32 num_runs) { mNumRuns = num_runs; }
-	
-private:
-
-
-
-	bool	mLoop;
-	bool 	mReplaySession;
-
-	S32		mNumRuns;
-	bool	mQuitAfterRuns;
-
-	void setAutopilotTarget(const S32 id);
-
-	bool	mRecording;
-	F32		mLastRecordTime;
-
-	bool	mStarted;
-	bool	mPlaying;
-	S32		mCurrentAction;
-
-	bool	mOverrideCamera;
-
-	class Action
-	{
-	public:
-
-		EActionType		mType;
-		LLVector3d		mTarget;
-		F64				mTime;
-		F32				mCameraView;
-		LLVector3		mCameraOrigin;
-		LLVector3		mCameraXAxis;
-		LLVector3		mCameraYAxis;
-		LLVector3		mCameraZAxis;
-	};
-
-	std::vector<Action>	mActions;
-	LLTimer					mTimer;
-
-};
-
-extern LLAgentPilot gAgentPilot;
-
-#endif // LL_LLAGENTPILOT_H
+/**

+ * @file llagentpilot.h

+ * @brief LLAgentPilot class definition

+ *

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

+#define LL_LLAGENTPILOT_H

+

+#include "stdtypes.h"

+#include "lltimer.h"

+#include "v3dmath.h"

+

+// Class that drives the agent around according to a "script".

+

+class LLAgentPilot

+{

+public:

+    enum EActionType

+    {

+        STRAIGHT,

+        TURN

+    };

+

+    LLAgentPilot();

+    virtual ~LLAgentPilot();

+

+    void load();

+    void loadTxt(const std::string& filename);

+    void loadXML(const std::string& filename);

+    void save();

+    void saveTxt(const std::string& filename);

+    void saveXML(const std::string& filename);

+

+    void startRecord();

+    void stopRecord();

+    void addAction(enum EActionType action);

+

+    void startPlayback();

+    void stopPlayback();

+

+    bool isRecording() { return mRecording; }

+    bool isPlaying() { return mPlaying; }

+    bool getOverrideCamera() { return mOverrideCamera; }

+

+    void updateTarget();

+

+    void addWaypoint();

+    void moveCamera();

+

+    void setReplaySession(bool new_val) { mReplaySession = new_val; }

+    bool getReplaySession() { return mReplaySession; }

+

+    void setLoop(bool new_val) { mLoop = new_val; }

+    bool getLoop() { return mLoop; }

+

+    void setQuitAfterRuns(bool quit_val) { mQuitAfterRuns = quit_val; }

+    void setNumRuns(S32 num_runs) { mNumRuns = num_runs; }

+

+private:

+

+

+

+    bool    mLoop;

+    bool    mReplaySession;

+

+    S32     mNumRuns;

+    bool    mQuitAfterRuns;

+

+    void setAutopilotTarget(const S32 id);

+

+    bool    mRecording;

+    F32     mLastRecordTime;

+

+    bool    mStarted;

+    bool    mPlaying;

+    S32     mCurrentAction;

+

+    bool    mOverrideCamera;

+

+    class Action

+    {

+    public:

+

+        EActionType     mType;

+        LLVector3d      mTarget;

+        F64             mTime;

+        F32             mCameraView;

+        LLVector3       mCameraOrigin;

+        LLVector3       mCameraXAxis;

+        LLVector3       mCameraYAxis;

+        LLVector3       mCameraZAxis;

+    };

+

+    std::vector<Action> mActions;

+    LLTimer                 mTimer;

+

+};

+

+extern LLAgentPilot gAgentPilot;

+

+#endif // LL_LLAGENTPILOT_H