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

diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp
index 3d3855030e..242bc48832 100644
--- a/indra/newview/lltoolobjpicker.cpp
+++ b/indra/newview/lltoolobjpicker.cpp
@@ -1,174 +1,174 @@
-/** 
- * @file lltoolobjpicker.cpp
- * @brief LLToolObjPicker class implementation
- *
- * $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$
- */
-
-// LLToolObjPicker is a transient tool, useful for a single object pick.
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lltoolobjpicker.h"
-
-#include "llagent.h"
-#include "llselectmgr.h"
-#include "llworld.h"
-#include "llviewercontrol.h"
-#include "llmenugl.h"
-#include "lltoolmgr.h"
-#include "llviewerobject.h"
-#include "llviewerobjectlist.h"
-#include "llviewermenu.h"
-#include "llviewercamera.h"
-#include "llviewerwindow.h"
-#include "lldrawable.h"
-#include "llrootview.h"
-
-
-LLToolObjPicker::LLToolObjPicker()
-:	LLTool( std::string("ObjPicker"), NULL ),
-	mPicked( false ),
-	mHitObjectID( LLUUID::null ),
-	mExitCallback( NULL ),
-	mExitCallbackData( NULL )
-{ }
-
-
-// returns true if an object was selected 
-bool LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	LLRootView* viewp = gViewerWindow->getRootView();
-	bool handled = viewp->handleMouseDown(x, y, mask);
-
-	mHitObjectID.setNull();
-
-	if (! handled)
-	{
-		// didn't click in any UI object, so must have clicked in the world
-		gViewerWindow->pickAsync(x, y, mask, pickCallback);
-		handled = true;
-	}
-	else
-	{
-		if (hasMouseCapture())
-		{
-			setMouseCapture(false);
-		}
-		else
-		{
-			LL_WARNS() << "PickerTool doesn't have mouse capture on mouseDown" << LL_ENDL;	
-		}
-	}
-
-	// Pass mousedown to base class
-	LLTool::handleMouseDown(x, y, mask);
-
-	return handled;
-}
-
-void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info)
-{
-	LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID;
-	LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull();
-}
-
-
-bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	LLView* viewp = gViewerWindow->getRootView();
-	bool handled = viewp->handleHover(x, y, mask);
-	if (handled)
-	{
-		// let UI handle this
-	}
-
-	LLTool::handleMouseUp(x, y, mask);
-	if (hasMouseCapture())
-	{
-		setMouseCapture(false);
-	}
-	else
-	{
-		LL_WARNS() << "PickerTool doesn't have mouse capture on mouseUp" << LL_ENDL;	
-	}
-	return handled;
-}
-
-
-bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask)
-{
-	LLView *viewp = gViewerWindow->getRootView();
-	bool handled = viewp->handleHover(x, y, mask);
-	if (!handled) 
-	{
-		// Used to do pick on hover.  Now we just always display the cursor.
-		ECursorType cursor = UI_CURSOR_ARROWLOCKED;
-
-		cursor = UI_CURSOR_TOOLPICKOBJECT3;
-
-		gViewerWindow->setCursor(cursor);
-	}
-	return handled;
-}
-
-
-void LLToolObjPicker::onMouseCaptureLost()
-{
-	if (mExitCallback)
-	{
-		mExitCallback(mExitCallbackData);
-
-		mExitCallback = NULL;
-		mExitCallbackData = NULL;
-	}
-
-	mPicked = false;
-	mHitObjectID.setNull();
-}
-
-// virtual
-void LLToolObjPicker::setExitCallback(void (*callback)(void *), void *callback_data)
-{
-	mExitCallback = callback;
-	mExitCallbackData = callback_data;
-}
-
-// virtual
-void LLToolObjPicker::handleSelect()
-{
-	LLTool::handleSelect();
-	setMouseCapture(true);
-}
-
-// virtual
-void LLToolObjPicker::handleDeselect()
-{
-	if (hasMouseCapture())
-	{
-		LLTool::handleDeselect();
-		setMouseCapture(false);
-	}
-}
-
-
-
+/**

+ * @file lltoolobjpicker.cpp

+ * @brief LLToolObjPicker class implementation

+ *

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

+ */

+

+// LLToolObjPicker is a transient tool, useful for a single object pick.

+

+#include "llviewerprecompiledheaders.h"

+

+#include "lltoolobjpicker.h"

+

+#include "llagent.h"

+#include "llselectmgr.h"

+#include "llworld.h"

+#include "llviewercontrol.h"

+#include "llmenugl.h"

+#include "lltoolmgr.h"

+#include "llviewerobject.h"

+#include "llviewerobjectlist.h"

+#include "llviewermenu.h"

+#include "llviewercamera.h"

+#include "llviewerwindow.h"

+#include "lldrawable.h"

+#include "llrootview.h"

+

+

+LLToolObjPicker::LLToolObjPicker()

+:   LLTool( std::string("ObjPicker"), NULL ),

+    mPicked( false ),

+    mHitObjectID( LLUUID::null ),

+    mExitCallback( NULL ),

+    mExitCallbackData( NULL )

+{ }

+

+

+// returns true if an object was selected

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

+{

+    LLRootView* viewp = gViewerWindow->getRootView();

+    bool handled = viewp->handleMouseDown(x, y, mask);

+

+    mHitObjectID.setNull();

+

+    if (! handled)

+    {

+        // didn't click in any UI object, so must have clicked in the world

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

+        handled = true;

+    }

+    else

+    {

+        if (hasMouseCapture())

+        {

+            setMouseCapture(false);

+        }

+        else

+        {

+            LL_WARNS() << "PickerTool doesn't have mouse capture on mouseDown" << LL_ENDL;

+        }

+    }

+

+    // Pass mousedown to base class

+    LLTool::handleMouseDown(x, y, mask);

+

+    return handled;

+}

+

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

+{

+    LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID;

+    LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull();

+}

+

+

+bool LLToolObjPicker::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+    LLView* viewp = gViewerWindow->getRootView();

+    bool handled = viewp->handleHover(x, y, mask);

+    if (handled)

+    {

+        // let UI handle this

+    }

+

+    LLTool::handleMouseUp(x, y, mask);

+    if (hasMouseCapture())

+    {

+        setMouseCapture(false);

+    }

+    else

+    {

+        LL_WARNS() << "PickerTool doesn't have mouse capture on mouseUp" << LL_ENDL;

+    }

+    return handled;

+}

+

+

+bool LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask)

+{

+    LLView *viewp = gViewerWindow->getRootView();

+    bool handled = viewp->handleHover(x, y, mask);

+    if (!handled)

+    {

+        // Used to do pick on hover.  Now we just always display the cursor.

+        ECursorType cursor = UI_CURSOR_ARROWLOCKED;

+

+        cursor = UI_CURSOR_TOOLPICKOBJECT3;

+

+        gViewerWindow->setCursor(cursor);

+    }

+    return handled;

+}

+

+

+void LLToolObjPicker::onMouseCaptureLost()

+{

+    if (mExitCallback)

+    {

+        mExitCallback(mExitCallbackData);

+

+        mExitCallback = NULL;

+        mExitCallbackData = NULL;

+    }

+

+    mPicked = false;

+    mHitObjectID.setNull();

+}

+

+// virtual

+void LLToolObjPicker::setExitCallback(void (*callback)(void *), void *callback_data)

+{

+    mExitCallback = callback;

+    mExitCallbackData = callback_data;

+}

+

+// virtual

+void LLToolObjPicker::handleSelect()

+{

+    LLTool::handleSelect();

+    setMouseCapture(true);

+}

+

+// virtual

+void LLToolObjPicker::handleDeselect()

+{

+    if (hasMouseCapture())

+    {

+        LLTool::handleDeselect();

+        setMouseCapture(false);

+    }

+}

+

+

+