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

diff --git a/indra/newview/llphysicsmotion.h b/indra/newview/llphysicsmotion.h
index 259a9abde6..ed187ac96e 100644
--- a/indra/newview/llphysicsmotion.h
+++ b/indra/newview/llphysicsmotion.h
@@ -1,118 +1,118 @@
-/** 
- * @file llphysicsmotion.h
- * @brief Implementation of LLPhysicsMotion class.
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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_LLPHYSICSMOTIONCONTROLLER_H
-#define LL_LLPHYSICSMOTIONCONTROLLER_H
-
-//-----------------------------------------------------------------------------
-// Header files
-//-----------------------------------------------------------------------------
-#include "llmotion.h"
-#include "llframetimer.h"
-
-#define PHYSICS_MOTION_FADEIN_TIME 1.0f
-#define PHYSICS_MOTION_FADEOUT_TIME 1.0f
-
-class LLPhysicsMotion;
-
-//-----------------------------------------------------------------------------
-// class LLPhysicsMotion
-//-----------------------------------------------------------------------------
-class LLPhysicsMotionController :
-	public LLMotion
-{
-public:
-	// Constructor
-	LLPhysicsMotionController(const LLUUID &id);
-
-	// Destructor
-	virtual ~LLPhysicsMotionController();
-
-public:
-	//-------------------------------------------------------------------------
-	// functions to support MotionController and MotionRegistry
-	//-------------------------------------------------------------------------
-
-	// static constructor
-	// all subclasses must implement such a function and register it
-	static LLMotion *create(const LLUUID &id) { return new LLPhysicsMotionController(id); }
-
-public:
-	//-------------------------------------------------------------------------
-	// animation callbacks to be implemented by subclasses
-	//-------------------------------------------------------------------------
-
-	// motions must specify whether or not they loop
-	virtual bool getLoop() { return true; }
-
-	// motions must report their total duration
-	virtual F32 getDuration() { return 0.0; }
-
-	// motions must report their "ease in" duration
-	virtual F32 getEaseInDuration() { return PHYSICS_MOTION_FADEIN_TIME; }
-
-	// motions must report their "ease out" duration.
-	virtual F32 getEaseOutDuration() { return PHYSICS_MOTION_FADEOUT_TIME; }
-
-	// called to determine when a motion should be activated/deactivated based on avatar pixel coverage
-	virtual F32 getMinPixelArea();
-
-	// motions must report their priority
-	virtual LLJoint::JointPriority getPriority() { return LLJoint::MEDIUM_PRIORITY; }
-
-	virtual LLMotionBlendType getBlendType() { return ADDITIVE_BLEND; }
-
-	// run-time (post constructor) initialization,
-	// called after parameters have been set
-	// must return true to indicate success and be available for activation
-	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-
-	// called when a motion is activated
-	// must return true to indicate success, or else
-	// it will be deactivated
-	virtual bool onActivate();
-
-	// called per time step
-	// must return true while it is active, and
-	// must return false when the motion is completed.
-	virtual bool onUpdate(F32 time, U8* joint_mask);
-
-	// called when a motion is deactivated
-	virtual void onDeactivate();
-
-	LLCharacter* getCharacter() { return mCharacter; }
-
-protected:
-	void addMotion(LLPhysicsMotion *motion);
-private:
-	LLCharacter*		mCharacter;
-
-	typedef std::vector<LLPhysicsMotion *> motion_vec_t;
-	motion_vec_t mMotions;
-};
-
-#endif // LL_LLPHYSICSMOTION_H
-
+/**

+ * @file llphysicsmotion.h

+ * @brief Implementation of LLPhysicsMotion class.

+ *

+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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_LLPHYSICSMOTIONCONTROLLER_H

+#define LL_LLPHYSICSMOTIONCONTROLLER_H

+

+//-----------------------------------------------------------------------------

+// Header files

+//-----------------------------------------------------------------------------

+#include "llmotion.h"

+#include "llframetimer.h"

+

+#define PHYSICS_MOTION_FADEIN_TIME 1.0f

+#define PHYSICS_MOTION_FADEOUT_TIME 1.0f

+

+class LLPhysicsMotion;

+

+//-----------------------------------------------------------------------------

+// class LLPhysicsMotion

+//-----------------------------------------------------------------------------

+class LLPhysicsMotionController :

+    public LLMotion

+{

+public:

+    // Constructor

+    LLPhysicsMotionController(const LLUUID &id);

+

+    // Destructor

+    virtual ~LLPhysicsMotionController();

+

+public:

+    //-------------------------------------------------------------------------

+    // functions to support MotionController and MotionRegistry

+    //-------------------------------------------------------------------------

+

+    // static constructor

+    // all subclasses must implement such a function and register it

+    static LLMotion *create(const LLUUID &id) { return new LLPhysicsMotionController(id); }

+

+public:

+    //-------------------------------------------------------------------------

+    // animation callbacks to be implemented by subclasses

+    //-------------------------------------------------------------------------

+

+    // motions must specify whether or not they loop

+    virtual bool getLoop() { return true; }

+

+    // motions must report their total duration

+    virtual F32 getDuration() { return 0.0; }

+

+    // motions must report their "ease in" duration

+    virtual F32 getEaseInDuration() { return PHYSICS_MOTION_FADEIN_TIME; }

+

+    // motions must report their "ease out" duration.

+    virtual F32 getEaseOutDuration() { return PHYSICS_MOTION_FADEOUT_TIME; }

+

+    // called to determine when a motion should be activated/deactivated based on avatar pixel coverage

+    virtual F32 getMinPixelArea();

+

+    // motions must report their priority

+    virtual LLJoint::JointPriority getPriority() { return LLJoint::MEDIUM_PRIORITY; }

+

+    virtual LLMotionBlendType getBlendType() { return ADDITIVE_BLEND; }

+

+    // run-time (post constructor) initialization,

+    // called after parameters have been set

+    // must return true to indicate success and be available for activation

+    virtual LLMotionInitStatus onInitialize(LLCharacter *character);

+

+    // called when a motion is activated

+    // must return true to indicate success, or else

+    // it will be deactivated

+    virtual bool onActivate();

+

+    // called per time step

+    // must return true while it is active, and

+    // must return false when the motion is completed.

+    virtual bool onUpdate(F32 time, U8* joint_mask);

+

+    // called when a motion is deactivated

+    virtual void onDeactivate();

+

+    LLCharacter* getCharacter() { return mCharacter; }

+

+protected:

+    void addMotion(LLPhysicsMotion *motion);

+private:

+    LLCharacter*        mCharacter;

+

+    typedef std::vector<LLPhysicsMotion *> motion_vec_t;

+    motion_vec_t mMotions;

+};

+

+#endif // LL_LLPHYSICSMOTION_H

+