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

diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index ec3dee1d89..91987f22f3 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -1,230 +1,230 @@
-/** 
- * @file llfloateropenobject.cpp
- * @brief LLFloaterOpenObject 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$
- */
-
-/*
- * Shows the contents of an object.
- * A floater wrapper for LLPanelObjectInventory
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloateropenobject.h"
-
-#include "llcachename.h"
-#include "llbutton.h"
-#include "llnotificationsutil.h"
-#include "lltextbox.h"
-
-#include "llinventorybridge.h"
-#include "llinventorymodel.h"
-#include "llinventorypanel.h"
-#include "llpanelobjectinventory.h"
-#include "llfloaterreg.h"
-#include "llselectmgr.h"
-#include "lluiconstants.h"
-#include "llviewerobject.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
-
-
-LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
-:	LLFloater(key),
-	mPanelInventoryObject(NULL),
-	mDirty(true)
-{
-	mCommitCallbackRegistrar.add("OpenObject.MoveToInventory",	boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this));
-	mCommitCallbackRegistrar.add("OpenObject.Cancel",			boost::bind(&LLFloaterOpenObject::onClickCancel, this));
-}
-
-LLFloaterOpenObject::~LLFloaterOpenObject()
-{
-//	sInstance = NULL;
-}
-
-// virtual
-bool LLFloaterOpenObject::postBuild()
-{
-	getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
-	mPanelInventoryObject = getChild<LLPanelObjectInventory>("object_contents");
-	
-	refresh();
-	return true;
-}
-
-void LLFloaterOpenObject::onOpen(const LLSD& key)
-{
-	LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();
-	if (object_selection->getRootObjectCount() != 1)
-	{
-		LLNotificationsUtil::add("UnableToViewContentsMoreThanOne");
-		closeFloater();
-		return;
-	}
-	if(!(object_selection->getPrimaryObject())) 
-	{
-		closeFloater();
-		return;
-	}
-	mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
-	refresh();
-}
-
-void LLFloaterOpenObject::refresh()
-{
-	mPanelInventoryObject->refresh();
-
-	std::string name = "";
-	bool enabled = false;
-
-	LLSelectNode* node = mObjectSelection->getFirstRootNode();
-	if (node) 
-	{
-		name = node->mName;
-		enabled = true;
-	}
-	else
-	{
-		name = "";
-		enabled = false;
-	}
-	
-	getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", name);
-	getChildView("copy_to_inventory_button")->setEnabled(enabled);
-	getChildView("copy_and_wear_button")->setEnabled(enabled);
-	getChildView("copy_and_replace_button")->setEnabled(enabled);
-
-}
-
-void LLFloaterOpenObject::draw()
-{
-	if (mDirty)
-	{
-		refresh();
-		mDirty = false;
-	}
-	LLFloater::draw();
-}
-
-void LLFloaterOpenObject::dirty()
-{
-	mDirty = true;
-}
-
-
-
-void LLFloaterOpenObject::moveToInventory(bool wear, bool replace)
-{
-	if (mObjectSelection->getRootObjectCount() != 1)
-	{
-		LLNotificationsUtil::add("OnlyCopyContentsOfSingleItem");
-		return;
-	}
-
-	LLSelectNode* node = mObjectSelection->getFirstRootNode();
-	if (!node) return;
-	LLViewerObject* object = node->getObject();
-	if (!object) return;
-
-	LLUUID object_id = object->getID();
-	std::string name = node->mName;
-
-	// Either create a sub-folder of clothing, or of the root folder.
-	LLUUID parent_category_id;
-	if (wear)
-	{
-		parent_category_id = gInventory.findCategoryUUIDForType(
-			LLFolderType::FT_CLOTHING);
-	}
-	else
-	{
-		parent_category_id = gInventory.getRootFolderID();
-	}
-
-	inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace);
-	// D567 copy thumbnail info
-	gInventory.createNewCategory(
-        parent_category_id,
-        LLFolderType::FT_NONE,
-        name,
-        func);
-}
-
-// static
-void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace)
-{
-	LLCatAndWear* wear_data = new LLCatAndWear;
-
-	wear_data->mCatID = category_id;
-	wear_data->mWear = wear;
-	wear_data->mFolderResponded = true;
-	wear_data->mReplace = replace;
-	
-	// Copy and/or move the items into the newly created folder.
-	// Ignore any "you're going to break this item" messages.
-	bool success = move_inv_category_world_to_agent(object_id,
-                                                    category_id,
-                                                    true,
-                                                    [](S32 result, void* data, const LLMoveInv*)
-                                                    {
-                                                        callbackMoveInventory(result, data);
-                                                    },
-                                                    (void*)wear_data);
-	if (!success)
-	{
-		delete wear_data;
-		wear_data = NULL;
-		
-		LLNotificationsUtil::add("OpenObjectCannotCopy");
-	}
-}
-
-// static
-void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
-{
-	LLCatAndWear* cat = (LLCatAndWear*)data;
-
-	if (result == 0)
-	{
-		LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();
-		if (active_panel)
-		{
-			active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO);
-		}
-	}
-
-	delete cat;
-}
-
-void LLFloaterOpenObject::onClickMoveToInventory()
-{
-	moveToInventory(false);
-	closeFloater();
-}
-
-void LLFloaterOpenObject::onClickCancel()
-{
-	closeFloater();
-}
+/**

+ * @file llfloateropenobject.cpp

+ * @brief LLFloaterOpenObject 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$

+ */

+

+/*

+ * Shows the contents of an object.

+ * A floater wrapper for LLPanelObjectInventory

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloateropenobject.h"

+

+#include "llcachename.h"

+#include "llbutton.h"

+#include "llnotificationsutil.h"

+#include "lltextbox.h"

+

+#include "llinventorybridge.h"

+#include "llinventorymodel.h"

+#include "llinventorypanel.h"

+#include "llpanelobjectinventory.h"

+#include "llfloaterreg.h"

+#include "llselectmgr.h"

+#include "lluiconstants.h"

+#include "llviewerobject.h"

+#include "lluictrlfactory.h"

+#include "llviewerwindow.h"

+

+

+LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)

+:   LLFloater(key),

+    mPanelInventoryObject(NULL),

+    mDirty(true)

+{

+    mCommitCallbackRegistrar.add("OpenObject.MoveToInventory",  boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this));

+    mCommitCallbackRegistrar.add("OpenObject.Cancel",           boost::bind(&LLFloaterOpenObject::onClickCancel, this));

+}

+

+LLFloaterOpenObject::~LLFloaterOpenObject()

+{

+//  sInstance = NULL;

+}

+

+// virtual

+bool LLFloaterOpenObject::postBuild()

+{

+    getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this

+    mPanelInventoryObject = getChild<LLPanelObjectInventory>("object_contents");

+

+    refresh();

+    return true;

+}

+

+void LLFloaterOpenObject::onOpen(const LLSD& key)

+{

+    LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();

+    if (object_selection->getRootObjectCount() != 1)

+    {

+        LLNotificationsUtil::add("UnableToViewContentsMoreThanOne");

+        closeFloater();

+        return;

+    }

+    if(!(object_selection->getPrimaryObject()))

+    {

+        closeFloater();

+        return;

+    }

+    mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();

+    refresh();

+}

+

+void LLFloaterOpenObject::refresh()

+{

+    mPanelInventoryObject->refresh();

+

+    std::string name = "";

+    bool enabled = false;

+

+    LLSelectNode* node = mObjectSelection->getFirstRootNode();

+    if (node)

+    {

+        name = node->mName;

+        enabled = true;

+    }

+    else

+    {

+        name = "";

+        enabled = false;

+    }

+

+    getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", name);

+    getChildView("copy_to_inventory_button")->setEnabled(enabled);

+    getChildView("copy_and_wear_button")->setEnabled(enabled);

+    getChildView("copy_and_replace_button")->setEnabled(enabled);

+

+}

+

+void LLFloaterOpenObject::draw()

+{

+    if (mDirty)

+    {

+        refresh();

+        mDirty = false;

+    }

+    LLFloater::draw();

+}

+

+void LLFloaterOpenObject::dirty()

+{

+    mDirty = true;

+}

+

+

+

+void LLFloaterOpenObject::moveToInventory(bool wear, bool replace)

+{

+    if (mObjectSelection->getRootObjectCount() != 1)

+    {

+        LLNotificationsUtil::add("OnlyCopyContentsOfSingleItem");

+        return;

+    }

+

+    LLSelectNode* node = mObjectSelection->getFirstRootNode();

+    if (!node) return;

+    LLViewerObject* object = node->getObject();

+    if (!object) return;

+

+    LLUUID object_id = object->getID();

+    std::string name = node->mName;

+

+    // Either create a sub-folder of clothing, or of the root folder.

+    LLUUID parent_category_id;

+    if (wear)

+    {

+        parent_category_id = gInventory.findCategoryUUIDForType(

+            LLFolderType::FT_CLOTHING);

+    }

+    else

+    {

+        parent_category_id = gInventory.getRootFolderID();

+    }

+

+    inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear,replace);

+    // D567 copy thumbnail info

+    gInventory.createNewCategory(

+        parent_category_id,

+        LLFolderType::FT_NONE,

+        name,

+        func);

+}

+

+// static

+void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace)

+{

+    LLCatAndWear* wear_data = new LLCatAndWear;

+

+    wear_data->mCatID = category_id;

+    wear_data->mWear = wear;

+    wear_data->mFolderResponded = true;

+    wear_data->mReplace = replace;

+

+    // Copy and/or move the items into the newly created folder.

+    // Ignore any "you're going to break this item" messages.

+    bool success = move_inv_category_world_to_agent(object_id,

+                                                    category_id,

+                                                    true,

+                                                    [](S32 result, void* data, const LLMoveInv*)

+                                                    {

+                                                        callbackMoveInventory(result, data);

+                                                    },

+                                                    (void*)wear_data);

+    if (!success)

+    {

+        delete wear_data;

+        wear_data = NULL;

+

+        LLNotificationsUtil::add("OpenObjectCannotCopy");

+    }

+}

+

+// static

+void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)

+{

+    LLCatAndWear* cat = (LLCatAndWear*)data;

+

+    if (result == 0)

+    {

+        LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();

+        if (active_panel)

+        {

+            active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO);

+        }

+    }

+

+    delete cat;

+}

+

+void LLFloaterOpenObject::onClickMoveToInventory()

+{

+    moveToInventory(false);

+    closeFloater();

+}

+

+void LLFloaterOpenObject::onClickCancel()

+{

+    closeFloater();

+}