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

diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index 445af8ae5c..f00ebeeb86 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -1,166 +1,166 @@
-/** 
- * @file llmorphview.cpp
- * @brief Container for Morph functionality
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llmorphview.h"
-
-#include "lljoint.h"
-
-#include "llagent.h"
-#include "llagentcamera.h"
-#include "lldrawable.h"
-#include "lldrawpoolavatar.h"
-#include "llface.h"
-//#include "llfirstuse.h"
-#include "llfloatertools.h"
-#include "llresmgr.h"
-#include "lltoolmgr.h"
-#include "lltoolmorph.h"
-#include "llviewercamera.h"
-#include "llvoavatarself.h"
-#include "llviewerwindow.h"
-#include "pipeline.h"
-
-LLMorphView *gMorphView = NULL;
-
-constexpr F32 MORPH_NEAR_CLIP = 0.1f;
-
-//-----------------------------------------------------------------------------
-// LLMorphView()
-//-----------------------------------------------------------------------------
-LLMorphView::LLMorphView(const LLMorphView::Params& p)
-: 	LLView(p),
-	mCameraTargetJoint( NULL ),
-	mCameraOffset(-0.5f, 0.05f, 0.07f ),
-	mCameraTargetOffset(0.f, 0.f, 0.05f ),
-	mOldCameraNearClip( 0.f ),
-	mCameraPitch( 0.f ),
-	mCameraYaw( 0.f ),
-	mCameraDrivenByKeys( false )
-{}
-
-//-----------------------------------------------------------------------------
-// initialize()
-//-----------------------------------------------------------------------------
-void	LLMorphView::initialize()
-{
-	mCameraPitch = 0.f;
-	mCameraYaw = 0.f;
-
-	if (!isAgentAvatarValid() || gAgentAvatarp->isDead())
-	{
-		gAgentCamera.changeCameraToDefault();
-		return;
-	}
-
-	gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE );
-	gAgentAvatarp->mSpecialRenderMode = 3;
-	
-	// set up camera for close look at avatar
-	mOldCameraNearClip = LLViewerCamera::getInstance()->getNear();
-	LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP);	
-}
-
-//-----------------------------------------------------------------------------
-// shutdown()
-//-----------------------------------------------------------------------------
-void	LLMorphView::shutdown()
-{
-	if (isAgentAvatarValid())
-	{
-		gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE );
-		gAgentAvatarp->mSpecialRenderMode = 0;
-		// reset camera
-		LLViewerCamera::getInstance()->setNear(mOldCameraNearClip);
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// setVisible()
-//-----------------------------------------------------------------------------
-void LLMorphView::setVisible(bool visible)
-{
-	if( visible != getVisible() )
-	{
-		LLView::setVisible(visible);
-
-		if (visible)
-		{
-			// TODO: verify some user action has already opened outfit editor? - Nyx
-			initialize();
-
-			// First run dialog
-			//LLFirstUse::useAppearance();
-		}
-		else
-		{
-			// TODO: verify some user action has already closed outfit editor ? - Nyx
-			shutdown();
-		}
-	}
-}
-
-void LLMorphView::updateCamera()
-{
-	if (!mCameraTargetJoint)
-	{
-		setCameraTargetJoint(gAgentAvatarp->getJoint("mHead"));
-	}	
-	if (!isAgentAvatarValid()) return;
-
-	LLJoint* root_joint = gAgentAvatarp->getRootJoint();
-	if( !root_joint )
-	{
-		return;
-	}
-
-	const LLQuaternion& avatar_rot = root_joint->getWorldRotation();
-
-	LLVector3d joint_pos = gAgent.getPosGlobalFromAgent(mCameraTargetJoint->getWorldPosition());
-	LLVector3d target_pos = joint_pos + mCameraTargetOffset * avatar_rot;
-
-	LLQuaternion camera_rot_yaw(mCameraYaw, LLVector3::z_axis);
-	LLQuaternion camera_rot_pitch(mCameraPitch, LLVector3::y_axis);
-
-	LLVector3d camera_pos = joint_pos + mCameraOffset * camera_rot_pitch * camera_rot_yaw * avatar_rot;
-
-	gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() );
-}
-
-void LLMorphView::setCameraDrivenByKeys(bool b)
-{
-	if( mCameraDrivenByKeys != b )
-	{
-		if( b )
-		{
-			// Reset to the default camera position specified by mCameraPitch, mCameraYaw, etc.
-			updateCamera();
-		}
-		mCameraDrivenByKeys = b;
-	}
-}
+/**

+ * @file llmorphview.cpp

+ * @brief Container for Morph functionality

+ *

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

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llmorphview.h"

+

+#include "lljoint.h"

+

+#include "llagent.h"

+#include "llagentcamera.h"

+#include "lldrawable.h"

+#include "lldrawpoolavatar.h"

+#include "llface.h"

+//#include "llfirstuse.h"

+#include "llfloatertools.h"

+#include "llresmgr.h"

+#include "lltoolmgr.h"

+#include "lltoolmorph.h"

+#include "llviewercamera.h"

+#include "llvoavatarself.h"

+#include "llviewerwindow.h"

+#include "pipeline.h"

+

+LLMorphView *gMorphView = NULL;

+

+constexpr F32 MORPH_NEAR_CLIP = 0.1f;

+

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

+// LLMorphView()

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

+LLMorphView::LLMorphView(const LLMorphView::Params& p)

+:   LLView(p),

+    mCameraTargetJoint( NULL ),

+    mCameraOffset(-0.5f, 0.05f, 0.07f ),

+    mCameraTargetOffset(0.f, 0.f, 0.05f ),

+    mOldCameraNearClip( 0.f ),

+    mCameraPitch( 0.f ),

+    mCameraYaw( 0.f ),

+    mCameraDrivenByKeys( false )

+{}

+

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

+// initialize()

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

+void    LLMorphView::initialize()

+{

+    mCameraPitch = 0.f;

+    mCameraYaw = 0.f;

+

+    if (!isAgentAvatarValid() || gAgentAvatarp->isDead())

+    {

+        gAgentCamera.changeCameraToDefault();

+        return;

+    }

+

+    gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE );

+    gAgentAvatarp->mSpecialRenderMode = 3;

+

+    // set up camera for close look at avatar

+    mOldCameraNearClip = LLViewerCamera::getInstance()->getNear();

+    LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP);

+}

+

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

+// shutdown()

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

+void    LLMorphView::shutdown()

+{

+    if (isAgentAvatarValid())

+    {

+        gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE );

+        gAgentAvatarp->mSpecialRenderMode = 0;

+        // reset camera

+        LLViewerCamera::getInstance()->setNear(mOldCameraNearClip);

+    }

+}

+

+

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

+// setVisible()

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

+void LLMorphView::setVisible(bool visible)

+{

+    if( visible != getVisible() )

+    {

+        LLView::setVisible(visible);

+

+        if (visible)

+        {

+            // TODO: verify some user action has already opened outfit editor? - Nyx

+            initialize();

+

+            // First run dialog

+            //LLFirstUse::useAppearance();

+        }

+        else

+        {

+            // TODO: verify some user action has already closed outfit editor ? - Nyx

+            shutdown();

+        }

+    }

+}

+

+void LLMorphView::updateCamera()

+{

+    if (!mCameraTargetJoint)

+    {

+        setCameraTargetJoint(gAgentAvatarp->getJoint("mHead"));

+    }

+    if (!isAgentAvatarValid()) return;

+

+    LLJoint* root_joint = gAgentAvatarp->getRootJoint();

+    if( !root_joint )

+    {

+        return;

+    }

+

+    const LLQuaternion& avatar_rot = root_joint->getWorldRotation();

+

+    LLVector3d joint_pos = gAgent.getPosGlobalFromAgent(mCameraTargetJoint->getWorldPosition());

+    LLVector3d target_pos = joint_pos + mCameraTargetOffset * avatar_rot;

+

+    LLQuaternion camera_rot_yaw(mCameraYaw, LLVector3::z_axis);

+    LLQuaternion camera_rot_pitch(mCameraPitch, LLVector3::y_axis);

+

+    LLVector3d camera_pos = joint_pos + mCameraOffset * camera_rot_pitch * camera_rot_yaw * avatar_rot;

+

+    gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() );

+}

+

+void LLMorphView::setCameraDrivenByKeys(bool b)

+{

+    if( mCameraDrivenByKeys != b )

+    {

+        if( b )

+        {

+            // Reset to the default camera position specified by mCameraPitch, mCameraYaw, etc.

+            updateCamera();

+        }

+        mCameraDrivenByKeys = b;

+    }

+}