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

diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 3d06066464..361462dae8 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -1,237 +1,237 @@
-/** 
- * @file llpreviewanim.cpp
- * @brief LLPreviewAnim class implementation
- *
- * $LicenseInfo:firstyear=2004&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 "llpreviewanim.h"
-#include "llbutton.h"
-#include "llresmgr.h"
-#include "llinventory.h"
-#include "llvoavatarself.h"
-#include "llagent.h"          // gAgent
-#include "llkeyframemotion.h"
-#include "llfilepicker.h"
-#include "lllineeditor.h"
-#include "lltrans.h"
-#include "lluictrlfactory.h"
-#include "lluictrlfactory.h"
-#include "lldatapacker.h"
-
-extern LLAgent gAgent;
-const S32 ADVANCED_VPAD = 3;
-
-LLPreviewAnim::LLPreviewAnim(const LLSD& key)
-	: LLPreview( key )
-{
-	mCommitCallbackRegistrar.add("PreviewAnim.Play", boost::bind(&LLPreviewAnim::play, this, _2));
-}
-
-// virtual
-bool LLPreviewAnim::postBuild()
-{
-	childSetCommitCallback("desc", LLPreview::onText, this);
-	getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
-	getChild<LLTextBox>("adv_trigger")->setClickedCallback(boost::bind(&LLPreviewAnim::showAdvanced, this));
-	pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");
-
-    // Assume that advanced stats start visible (for XUI preview tool's purposes)
-    pAdvancedStatsTextBox->setVisible(false);
-    LLRect rect = getRect();
-    reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);
-
-	return LLPreview::postBuild();
-}
-
-// llinventorybridge also calls into here
-void LLPreviewAnim::play(const LLSD& param)
-{
-	const LLInventoryItem *item = getItem();
-
-	if(item)
-	{
-		LLUUID itemID=item->getAssetUUID();
-
-		std::string btn_name = param.asString();
-		LLButton* btn_inuse;
-		LLButton* btn_other;
-
-		if ("Inworld" == btn_name)
-		{
-			btn_inuse = getChild<LLButton>("Inworld");
-			btn_other = getChild<LLButton>("Locally");
-		}
-		else if ("Locally" == btn_name)
-		{
-			btn_inuse = getChild<LLButton>("Locally");
-			btn_other = getChild<LLButton>("Inworld");
-		}
-		else
-		{
-			return;
-		}
-
-		if (btn_inuse)
-		{
-			btn_inuse->toggleState();
-		}
-
-		if (btn_other)
-		{
-			btn_other->setEnabled(false);
-		}
-		
-		if (getChild<LLUICtrl>(btn_name)->getValue().asBoolean() ) 
-		{
-			if("Inworld" == btn_name)
-			{
-				gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_START);
-			}
-			else
-			{
-				gAgentAvatarp->startMotion(item->getAssetUUID());
-			}
-
-			LLMotion* motion = gAgentAvatarp->findMotion(itemID);
-			if (motion)
-			{
-				mItemID = itemID;
-				mDidStart = false;
-			}
-		}
-		else
-		{
-			gAgentAvatarp->stopMotion(itemID);
-			gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP);
-
-			if (btn_other)
-			{
-				btn_other->setEnabled(true);
-			}
-		}
-	}
-}
-
-// virtual
-void LLPreviewAnim::draw()
-{
-	LLPreview::draw();
-	if (!this->mItemID.isNull())
-	{
-		LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
-		if (motion)
-		{
-			if (motion->isStopped() && this->mDidStart)
-			{
-				cleanup();
-			}
-			if(gAgentAvatarp->isMotionActive(this->mItemID) && !this->mDidStart)
-			{
-				const LLInventoryItem *item = getItem();
-				LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
-				if (item && motion)
-				{
-					motion->setName(item->getName());
-				}
-				this->mDidStart = true;
-			}
-		}
-	}
-}
-
-// virtual
-void LLPreviewAnim::refreshFromItem()
-{
-    const LLInventoryItem* item = getItem();
-    if (!item)
-    {
-        return;
-    }
-
-    // Preload motion
-    gAgentAvatarp->createMotion(item->getAssetUUID());  
-
-    LLPreview::refreshFromItem();
-}
-
-void LLPreviewAnim::cleanup()
-{
-	this->mItemID = LLUUID::null;
-	this->mDidStart = false;
-	getChild<LLUICtrl>("Inworld")->setValue(false);
-	getChild<LLUICtrl>("Locally")->setValue(false);
-	getChild<LLUICtrl>("Inworld")->setEnabled(true);
-	getChild<LLUICtrl>("Locally")->setEnabled(true);
-}
-
-// virtual
-void LLPreviewAnim::onClose(bool app_quitting)
-{
-	const LLInventoryItem *item = getItem();
-
-	if(item)
-	{
-		gAgentAvatarp->stopMotion(item->getAssetUUID());
-		gAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP);
-	}
-}
-
-void LLPreviewAnim::showAdvanced()
-{
-    bool was_visible =  pAdvancedStatsTextBox->getVisible();
-
-    if (was_visible)
-    {
-        pAdvancedStatsTextBox->setVisible(false);
-        LLRect rect = getRect();
-        reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);
-    }
-    else
-    {
-        pAdvancedStatsTextBox->setVisible(true);
-        LLRect rect = getRect();
-        reshape(rect.getWidth(), rect.getHeight() + pAdvancedStatsTextBox->getRect().getHeight() + ADVANCED_VPAD, false);
-
-        LLMotion *motion = NULL;
-        const LLInventoryItem* item = getItem();
-        if (item)
-        {
-            // if motion exists, will return existing one.
-            // Needed because viewer can purge motions
-            motion = gAgentAvatarp->createMotion(item->getAssetUUID());
-        }
-
-        // set text
-        if (motion)
-        {
-            pAdvancedStatsTextBox->setTextArg("[PRIORITY]", llformat("%d", motion->getPriority()));
-            pAdvancedStatsTextBox->setTextArg("[DURATION]", llformat("%.2f", motion->getDuration()));
-            pAdvancedStatsTextBox->setTextArg("[EASE_IN]", llformat("%.2f", motion->getEaseInDuration()));
-            pAdvancedStatsTextBox->setTextArg("[EASE_OUT]", llformat("%.2f", motion->getEaseOutDuration()));
-            pAdvancedStatsTextBox->setTextArg("[IS_LOOP]", (motion->getLoop() ? LLTrans::getString("PermYes") : LLTrans::getString("PermNo")));
-            pAdvancedStatsTextBox->setTextArg("[NUM_JOINTS]", llformat("%d", motion->getNumJointMotions()));
-        }
-    }
-}
+/**

+ * @file llpreviewanim.cpp

+ * @brief LLPreviewAnim class implementation

+ *

+ * $LicenseInfo:firstyear=2004&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 "llpreviewanim.h"

+#include "llbutton.h"

+#include "llresmgr.h"

+#include "llinventory.h"

+#include "llvoavatarself.h"

+#include "llagent.h"          // gAgent

+#include "llkeyframemotion.h"

+#include "llfilepicker.h"

+#include "lllineeditor.h"

+#include "lltrans.h"

+#include "lluictrlfactory.h"

+#include "lluictrlfactory.h"

+#include "lldatapacker.h"

+

+extern LLAgent gAgent;

+const S32 ADVANCED_VPAD = 3;

+

+LLPreviewAnim::LLPreviewAnim(const LLSD& key)

+    : LLPreview( key )

+{

+    mCommitCallbackRegistrar.add("PreviewAnim.Play", boost::bind(&LLPreviewAnim::play, this, _2));

+}

+

+// virtual

+bool LLPreviewAnim::postBuild()

+{

+    childSetCommitCallback("desc", LLPreview::onText, this);

+    getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);

+    getChild<LLTextBox>("adv_trigger")->setClickedCallback(boost::bind(&LLPreviewAnim::showAdvanced, this));

+    pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");

+

+    // Assume that advanced stats start visible (for XUI preview tool's purposes)

+    pAdvancedStatsTextBox->setVisible(false);

+    LLRect rect = getRect();

+    reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);

+

+    return LLPreview::postBuild();

+}

+

+// llinventorybridge also calls into here

+void LLPreviewAnim::play(const LLSD& param)

+{

+    const LLInventoryItem *item = getItem();

+

+    if(item)

+    {

+        LLUUID itemID=item->getAssetUUID();

+

+        std::string btn_name = param.asString();

+        LLButton* btn_inuse;

+        LLButton* btn_other;

+

+        if ("Inworld" == btn_name)

+        {

+            btn_inuse = getChild<LLButton>("Inworld");

+            btn_other = getChild<LLButton>("Locally");

+        }

+        else if ("Locally" == btn_name)

+        {

+            btn_inuse = getChild<LLButton>("Locally");

+            btn_other = getChild<LLButton>("Inworld");

+        }

+        else

+        {

+            return;

+        }

+

+        if (btn_inuse)

+        {

+            btn_inuse->toggleState();

+        }

+

+        if (btn_other)

+        {

+            btn_other->setEnabled(false);

+        }

+

+        if (getChild<LLUICtrl>(btn_name)->getValue().asBoolean() )

+        {

+            if("Inworld" == btn_name)

+            {

+                gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_START);

+            }

+            else

+            {

+                gAgentAvatarp->startMotion(item->getAssetUUID());

+            }

+

+            LLMotion* motion = gAgentAvatarp->findMotion(itemID);

+            if (motion)

+            {

+                mItemID = itemID;

+                mDidStart = false;

+            }

+        }

+        else

+        {

+            gAgentAvatarp->stopMotion(itemID);

+            gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP);

+

+            if (btn_other)

+            {

+                btn_other->setEnabled(true);

+            }

+        }

+    }

+}

+

+// virtual

+void LLPreviewAnim::draw()

+{

+    LLPreview::draw();

+    if (!this->mItemID.isNull())

+    {

+        LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);

+        if (motion)

+        {

+            if (motion->isStopped() && this->mDidStart)

+            {

+                cleanup();

+            }

+            if(gAgentAvatarp->isMotionActive(this->mItemID) && !this->mDidStart)

+            {

+                const LLInventoryItem *item = getItem();

+                LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);

+                if (item && motion)

+                {

+                    motion->setName(item->getName());

+                }

+                this->mDidStart = true;

+            }

+        }

+    }

+}

+

+// virtual

+void LLPreviewAnim::refreshFromItem()

+{

+    const LLInventoryItem* item = getItem();

+    if (!item)

+    {

+        return;

+    }

+

+    // Preload motion

+    gAgentAvatarp->createMotion(item->getAssetUUID());

+

+    LLPreview::refreshFromItem();

+}

+

+void LLPreviewAnim::cleanup()

+{

+    this->mItemID = LLUUID::null;

+    this->mDidStart = false;

+    getChild<LLUICtrl>("Inworld")->setValue(false);

+    getChild<LLUICtrl>("Locally")->setValue(false);

+    getChild<LLUICtrl>("Inworld")->setEnabled(true);

+    getChild<LLUICtrl>("Locally")->setEnabled(true);

+}

+

+// virtual

+void LLPreviewAnim::onClose(bool app_quitting)

+{

+    const LLInventoryItem *item = getItem();

+

+    if(item)

+    {

+        gAgentAvatarp->stopMotion(item->getAssetUUID());

+        gAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP);

+    }

+}

+

+void LLPreviewAnim::showAdvanced()

+{

+    bool was_visible =  pAdvancedStatsTextBox->getVisible();

+

+    if (was_visible)

+    {

+        pAdvancedStatsTextBox->setVisible(false);

+        LLRect rect = getRect();

+        reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);

+    }

+    else

+    {

+        pAdvancedStatsTextBox->setVisible(true);

+        LLRect rect = getRect();

+        reshape(rect.getWidth(), rect.getHeight() + pAdvancedStatsTextBox->getRect().getHeight() + ADVANCED_VPAD, false);

+

+        LLMotion *motion = NULL;

+        const LLInventoryItem* item = getItem();

+        if (item)

+        {

+            // if motion exists, will return existing one.

+            // Needed because viewer can purge motions

+            motion = gAgentAvatarp->createMotion(item->getAssetUUID());

+        }

+

+        // set text

+        if (motion)

+        {

+            pAdvancedStatsTextBox->setTextArg("[PRIORITY]", llformat("%d", motion->getPriority()));

+            pAdvancedStatsTextBox->setTextArg("[DURATION]", llformat("%.2f", motion->getDuration()));

+            pAdvancedStatsTextBox->setTextArg("[EASE_IN]", llformat("%.2f", motion->getEaseInDuration()));

+            pAdvancedStatsTextBox->setTextArg("[EASE_OUT]", llformat("%.2f", motion->getEaseOutDuration()));

+            pAdvancedStatsTextBox->setTextArg("[IS_LOOP]", (motion->getLoop() ? LLTrans::getString("PermYes") : LLTrans::getString("PermNo")));

+            pAdvancedStatsTextBox->setTextArg("[NUM_JOINTS]", llformat("%d", motion->getNumJointMotions()));

+        }

+    }

+}