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

diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp
index 3d1dbed650..e93c3006a5 100644
--- a/indra/newview/lltoolface.cpp
+++ b/indra/newview/lltoolface.cpp
@@ -1,151 +1,151 @@
-/** 
- * @file lltoolface.cpp
- * @brief A tool to manipulate faces
- *
- * $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"
-
-// File includes
-#include "lltoolface.h" 
-
-// Library includes
-#include "llfloaterreg.h"
-#include "v3math.h"
-
-// Viewer includes
-#include "llviewercontrol.h"
-#include "llselectmgr.h"
-#include "llviewerobject.h"
-#include "llviewerwindow.h"
-#include "llfloatertools.h"
-
-//
-// Member functions
-//
-
-LLToolFace::LLToolFace()
-:	LLTool(std::string("Texture"))
-{ }
-
-
-LLToolFace::~LLToolFace()
-{ }
-
-
-bool LLToolFace::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 properties
-		LLFloaterReg::showInstance("build", "Texture");
-		return true;
-	}
-	else
-	{
-		// Nothing selected means the first mouse click was probably
-		// bad, so try again.
-		return false;
-	}
-}
-
-
-bool LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	gViewerWindow->pickAsync(x, y, mask, pickCallback);
-	return true;
-}
-
-void LLToolFace::pickCallback(const LLPickInfo& pick_info)
-{
-	LLViewerObject* hit_obj	= pick_info.getObject();
-	if (hit_obj)
-	{
-		S32 hit_face = pick_info.mObjectFace;
-		
-		if (hit_obj->isAvatar())
-		{
-			// ...clicked on an avatar, so don't do anything
-			return;
-		}
-
-		// ...clicked on a world object, try to pick the appropriate face
-
-		if (pick_info.mKeyMask & MASK_SHIFT)
-		{
-			// If object not selected, need to inform sim
-			if ( !hit_obj->isSelected() )
-			{
-				// object wasn't selected so add the object and face
-				LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);
-			}
-			else if (!LLSelectMgr::getInstance()->getSelection()->contains(hit_obj, hit_face) )
-			{
-				// object is selected, but not this face, so add it.
-				LLSelectMgr::getInstance()->addAsIndividual(hit_obj, hit_face);
-			}
-			else
-			{
-				// object is selected, as is this face, so remove the face.
-				LLSelectMgr::getInstance()->remove(hit_obj, hit_face);
-
-				// BUG: If you remove the last face, the simulator won't know about it.
-			}
-		}
-		else
-		{
-			// clicked without modifiers, select only
-			// this face
-			LLSelectMgr::getInstance()->deselectAll();
-			LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);
-		}
-	}
-	else
-	{
-		if (!(pick_info.mKeyMask == MASK_SHIFT))
-		{
-			LLSelectMgr::getInstance()->deselectAll();
-		}
-	}
-}
-
-
-void LLToolFace::handleSelect()
-{
-	// From now on, draw faces
-	LLSelectMgr::getInstance()->setTEMode(true);
-}
-
-
-void LLToolFace::handleDeselect()
-{
-	// Stop drawing faces
-	LLSelectMgr::getInstance()->setTEMode(false);
-}
-
-
-void LLToolFace::render()
-{
-	// for now, do nothing
-}
+/**

+ * @file lltoolface.cpp

+ * @brief A tool to manipulate faces

+ *

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

+

+// File includes

+#include "lltoolface.h"

+

+// Library includes

+#include "llfloaterreg.h"

+#include "v3math.h"

+

+// Viewer includes

+#include "llviewercontrol.h"

+#include "llselectmgr.h"

+#include "llviewerobject.h"

+#include "llviewerwindow.h"

+#include "llfloatertools.h"

+

+//

+// Member functions

+//

+

+LLToolFace::LLToolFace()

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

+{ }

+

+

+LLToolFace::~LLToolFace()

+{ }

+

+

+bool LLToolFace::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 properties

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

+        return true;

+    }

+    else

+    {

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

+        // bad, so try again.

+        return false;

+    }

+}

+

+

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

+{

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

+    return true;

+}

+

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

+{

+    LLViewerObject* hit_obj = pick_info.getObject();

+    if (hit_obj)

+    {

+        S32 hit_face = pick_info.mObjectFace;

+

+        if (hit_obj->isAvatar())

+        {

+            // ...clicked on an avatar, so don't do anything

+            return;

+        }

+

+        // ...clicked on a world object, try to pick the appropriate face

+

+        if (pick_info.mKeyMask & MASK_SHIFT)

+        {

+            // If object not selected, need to inform sim

+            if ( !hit_obj->isSelected() )

+            {

+                // object wasn't selected so add the object and face

+                LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);

+            }

+            else if (!LLSelectMgr::getInstance()->getSelection()->contains(hit_obj, hit_face) )

+            {

+                // object is selected, but not this face, so add it.

+                LLSelectMgr::getInstance()->addAsIndividual(hit_obj, hit_face);

+            }

+            else

+            {

+                // object is selected, as is this face, so remove the face.

+                LLSelectMgr::getInstance()->remove(hit_obj, hit_face);

+

+                // BUG: If you remove the last face, the simulator won't know about it.

+            }

+        }

+        else

+        {

+            // clicked without modifiers, select only

+            // this face

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

+            LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);

+        }

+    }

+    else

+    {

+        if (!(pick_info.mKeyMask == MASK_SHIFT))

+        {

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

+        }

+    }

+}

+

+

+void LLToolFace::handleSelect()

+{

+    // From now on, draw faces

+    LLSelectMgr::getInstance()->setTEMode(true);

+}

+

+

+void LLToolFace::handleDeselect()

+{

+    // Stop drawing faces

+    LLSelectMgr::getInstance()->setTEMode(false);

+}

+

+

+void LLToolFace::render()

+{

+    // for now, do nothing

+}