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

diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
index bf31f77f49..e1fd1abeb2 100644
--- a/indra/newview/lltoolindividual.cpp
+++ b/indra/newview/lltoolindividual.cpp
@@ -1,115 +1,115 @@
-/** 
- * @file lltoolindividual.cpp
- * @brief LLToolIndividual class implementation
- *
- * $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$
- */
-
-//*****************************************************************************
-//
-// This is a tool for selecting individual object from the
-// toolbox. Handy for when you want to deal with child object
-// inventory...
-//
-//*****************************************************************************
-
-#include "llviewerprecompiledheaders.h"
-#include "lltoolindividual.h"
-
-#include "llfloaterreg.h"
-#include "llselectmgr.h"
-#include "llviewerobject.h"
-#include "llviewerwindow.h"
-#include "llfloatertools.h"
-
-///----------------------------------------------------------------------------
-/// Globals
-///----------------------------------------------------------------------------
-
-
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-
-///----------------------------------------------------------------------------
-/// Class LLToolIndividual
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLToolIndividual::LLToolIndividual()
-: LLTool(std::string("Individual"))
-{
-}
-
-// Destroys the object
-LLToolIndividual::~LLToolIndividual()
-{
-}
-
-bool LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	gViewerWindow->pickAsync(x, y, mask, pickCallback);
-	return true;
-}
-
-void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)
-{
-	LLViewerObject* obj = pick_info.getObject();
-	LLSelectMgr::getInstance()->deselectAll();
-	if(obj)
-	{
-		LLSelectMgr::getInstance()->selectObjectOnly(obj);
-	}
-}
-
-bool LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())
-	{
-		// You should already have an object selected from the mousedown.
-		// If so, show its inventory. 
-		LLFloaterReg::showInstance("build", "Content");
-		return true;
-	}
-	else
-	{
-		// Nothing selected means the first mouse click was probably
-		// bad, so try again.
-		return false;
-	}
-}
-
-void LLToolIndividual::handleSelect()
-{
-	const bool children_ok = true;
-	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
-	LLSelectMgr::getInstance()->deselectAll();
-	if(obj)
-	{
-		LLSelectMgr::getInstance()->selectObjectOnly(obj);
-	}
-}
-
-///----------------------------------------------------------------------------
-/// Local function definitions
-///----------------------------------------------------------------------------
+/**

+ * @file lltoolindividual.cpp

+ * @brief LLToolIndividual class implementation

+ *

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

+ */

+

+//*****************************************************************************

+//

+// This is a tool for selecting individual object from the

+// toolbox. Handy for when you want to deal with child object

+// inventory...

+//

+//*****************************************************************************

+

+#include "llviewerprecompiledheaders.h"

+#include "lltoolindividual.h"

+

+#include "llfloaterreg.h"

+#include "llselectmgr.h"

+#include "llviewerobject.h"

+#include "llviewerwindow.h"

+#include "llfloatertools.h"

+

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

+/// Globals

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

+

+

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

+/// Local function declarations, constants, enums, and typedefs

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

+

+

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

+/// Class LLToolIndividual

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

+

+// Default constructor

+LLToolIndividual::LLToolIndividual()

+: LLTool(std::string("Individual"))

+{

+}

+

+// Destroys the object

+LLToolIndividual::~LLToolIndividual()

+{

+}

+

+bool LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)

+{

+    gViewerWindow->pickAsync(x, y, mask, pickCallback);

+    return true;

+}

+

+void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)

+{

+    LLViewerObject* obj = pick_info.getObject();

+    LLSelectMgr::getInstance()->deselectAll();

+    if(obj)

+    {

+        LLSelectMgr::getInstance()->selectObjectOnly(obj);

+    }

+}

+

+bool LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)

+{

+    if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())

+    {

+        // You should already have an object selected from the mousedown.

+        // If so, show its inventory.

+        LLFloaterReg::showInstance("build", "Content");

+        return true;

+    }

+    else

+    {

+        // Nothing selected means the first mouse click was probably

+        // bad, so try again.

+        return false;

+    }

+}

+

+void LLToolIndividual::handleSelect()

+{

+    const bool children_ok = true;

+    LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);

+    LLSelectMgr::getInstance()->deselectAll();

+    if(obj)

+    {

+        LLSelectMgr::getInstance()->selectObjectOnly(obj);

+    }

+}

+

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

+/// Local function definitions

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