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

diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index ef3d92ca54..5b2b78d98a 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -1,478 +1,478 @@
-/** 
- * @file lltoolfocus.cpp
- * @brief A tool to set the build focus point.
- *
- * $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 "lltoolfocus.h" 
-
-// Library includes
-#include "v3math.h"
-#include "llfontgl.h"
-#include "llui.h"
-
-// Viewer includes
-#include "llagent.h"
-#include "llagentcamera.h"
-#include "llbutton.h"
-#include "llviewercontrol.h"
-#include "lldrawable.h"
-#include "lltooltip.h"
-#include "llhudmanager.h"
-#include "llfloatertools.h"
-#include "llselectmgr.h"
-#include "llstatusbar.h"
-#include "lltoolmgr.h"
-#include "llviewercamera.h"
-#include "llviewerobject.h"
-#include "llviewerwindow.h"
-#include "llvoavatarself.h"
-#include "llmorphview.h"
-#include "llfloaterreg.h"
-#include "llfloatercamera.h"
-#include "llmenugl.h"
-
-// Globals
-bool gCameraBtnZoom = true;
-bool gCameraBtnOrbit = false;
-bool gCameraBtnPan = false;
-
-const S32 SLOP_RANGE = 4;
-
-//
-// Camera - shared functionality
-//
-
-LLToolCamera::LLToolCamera()
-:	LLTool(std::string("Camera")),
-	mAccumX(0),
-	mAccumY(0),
-	mMouseDownX(0),
-	mMouseDownY(0),
-	mOutsideSlopX(false),
-	mOutsideSlopY(false),
-	mValidClickPoint(false),
-    mClickPickPending(false),
-	mValidSelection(false),
-	mMouseSteering(false),
-	mMouseUpX(0),
-	mMouseUpY(0),
-	mMouseUpMask(MASK_NONE)
-{ }
-
-
-LLToolCamera::~LLToolCamera()
-{ }
-
-// virtual
-void LLToolCamera::handleSelect()
-{
-	if (gFloaterTools)
-	{
-		gFloaterTools->setStatusText("camera");
-		// in case we start from tools floater, we count any selection as valid
-		mValidSelection = gFloaterTools->getVisible();
-	}
-}
-
-// virtual
-void LLToolCamera::handleDeselect()
-{
-//	gAgent.setLookingAtAvatar(false);
-
-	// Make sure that temporary selection won't pass anywhere except pie tool.
-	MASK override_mask = gKeyboard ? gKeyboard->currentMask(true) : 0;
-	if (!mValidSelection && (override_mask != MASK_NONE || (gFloaterTools && gFloaterTools->getVisible())))
-	{
-		LLMenuGL::sMenuContainer->hideMenus();
-		LLSelectMgr::getInstance()->validateSelection();
-	}
-}
-
-bool LLToolCamera::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	// Ensure a mouseup
-	setMouseCapture(true);
-
-	// call the base class to propogate info to sim
-	LLTool::handleMouseDown(x, y, mask);
-
-	mAccumX = 0;
-	mAccumY = 0;
-
-	mOutsideSlopX = false;
-	mOutsideSlopY = false;
-
-	mValidClickPoint = false;
-
-    // Sometimes Windows issues down and up events near simultaneously
-    // without giving async pick a chance to trigged
-    // Ex: mouse from numlock emulation
-    mClickPickPending = true;
-
-	// If mouse capture gets ripped away, claim we moused up
-	// at the point we moused down. JC
-	mMouseUpX = x;
-	mMouseUpY = y;
-	mMouseUpMask = mask;
-
-	gViewerWindow->hideCursor();
-
-	gViewerWindow->pickAsync(x, y, mask, pickCallback, /*bool pick_transparent*/ false, /*bool pick_rigged*/ false, /*bool pick_unselectable*/ true);
-
-	return true;
-}
-
-void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
-{
-    LLToolCamera* camera = LLToolCamera::getInstance();
-	if (!camera->mClickPickPending)
-	{
-		return;
-	}
-    camera->mClickPickPending = false;
-
-    camera->mMouseDownX = pick_info.mMousePt.mX;
-    camera->mMouseDownY = pick_info.mMousePt.mY;
-
-	gViewerWindow->moveCursorToCenter();
-
-	// Potentially recenter if click outside rectangle
-	LLViewerObject* hit_obj = pick_info.getObject();
-
-	// Check for hit the sky, or some other invalid point
-	if (!hit_obj && pick_info.mPosGlobal.isExactlyZero())
-	{
-        camera->mValidClickPoint = false;
-		return;
-	}
-
-	// check for hud attachments
-	if (hit_obj && hit_obj->isHUDAttachment())
-	{
-		LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
-		if (!selection->getObjectCount() || selection->getSelectType() != SELECT_TYPE_HUD)
-		{
-            camera->mValidClickPoint = false;
-			return;
-		}
-	}
-
-	if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() )
-	{
-		bool good_customize_avatar_hit = false;
-		if( hit_obj )
-		{
-			if (isAgentAvatarValid() && (hit_obj == gAgentAvatarp))
-			{
-				// It's you
-				good_customize_avatar_hit = true;
-			}
-			else if (hit_obj->isAttachment() && hit_obj->permYouOwner())
-			{
-				// It's an attachment that you're wearing
-				good_customize_avatar_hit = true;
-			}
-		}
-
-		if( !good_customize_avatar_hit )
-		{
-            camera->mValidClickPoint = false;
-			return;
-		}
-
-		if( gMorphView )
-		{
-			gMorphView->setCameraDrivenByKeys( false );
-		}
-	}
-	//RN: check to see if this is mouse-driving as opposed to ALT-zoom or Focus tool
-	else if (pick_info.mKeyMask & MASK_ALT || 
-			(LLToolMgr::getInstance()->getCurrentTool()->getName() == "Camera")) 
-	{
-		LLViewerObject* hit_obj = pick_info.getObject();
-		if (hit_obj)
-		{
-			// ...clicked on a world object, so focus at its position
-			if (!hit_obj->isHUDAttachment())
-			{
-				gAgentCamera.setFocusOnAvatar(false, ANIMATE);
-				gAgentCamera.setFocusGlobal(pick_info);
-			}
-		}
-		else if (!pick_info.mPosGlobal.isExactlyZero())
-		{
-			// Hit the ground
-			gAgentCamera.setFocusOnAvatar(false, ANIMATE);
-			gAgentCamera.setFocusGlobal(pick_info);
-		}
-
-		bool zoom_tool = gCameraBtnZoom && (LLToolMgr::getInstance()->getBaseTool() == LLToolCamera::getInstance());
-		if (!(pick_info.mKeyMask & MASK_ALT) &&
-			!LLFloaterCamera::inFreeCameraMode() &&
-			!zoom_tool &&
-			gAgentCamera.cameraThirdPerson() &&
-			gViewerWindow->getLeftMouseDown() && 
-			!gSavedSettings.getBOOL("FreezeTime") &&
-			(hit_obj == gAgentAvatarp || 
-			 (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf())))
-		{
-			LLToolCamera::getInstance()->mMouseSteering = true;
-		}
-
-	}
-
-    camera->mValidClickPoint = true;
-
-	if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() )
-	{
-		gAgentCamera.setFocusOnAvatar(false, false);
-		
-		LLVector3d cam_pos = gAgentCamera.getCameraPositionGlobal();
-
-		gAgentCamera.setCameraPosAndFocusGlobal( cam_pos, pick_info.mPosGlobal, pick_info.mObjectID);
-	}
-}
-
-
-// "Let go" of the mouse, for example on mouse up or when
-// we lose mouse capture.  This ensures that cursor becomes visible
-// if a modal dialog pops up during Alt-Zoom. JC
-void LLToolCamera::releaseMouse()
-{
-	// Need to tell the sim that the mouse button is up, since this
-	// tool is no longer working and cursor is visible (despite actual
-	// mouse button status).
-	LLTool::handleMouseUp(mMouseUpX, mMouseUpY, mMouseUpMask);
-
-	gViewerWindow->showCursor();
-
-	//for the situation when left click was performed on the Agent
-	if (!LLFloaterCamera::inFreeCameraMode())
-	{
-		LLToolMgr::getInstance()->clearTransientTool();
-	}
-
-	mMouseSteering = false;
-	mValidClickPoint = false;
-	mOutsideSlopX = false;
-	mOutsideSlopY = false;
-}
-
-
-bool LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	// Claim that we're mousing up somewhere
-	mMouseUpX = x;
-	mMouseUpY = y;
-	mMouseUpMask = mask;
-
-	if (hasMouseCapture())
-	{
-        // Do not move camera if we haven't gotten a pick
-        if (!mClickPickPending)
-        {
-            if (mValidClickPoint)
-            {
-                if (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode())
-                {
-                    LLCoordGL mouse_pos;
-                    LLVector3 focus_pos = gAgent.getPosAgentFromGlobal(gAgentCamera.getFocusGlobal());
-                    bool success = LLViewerCamera::getInstance()->projectPosAgentToScreen(focus_pos, mouse_pos);
-                    if (success)
-                    {
-                        LLUI::getInstance()->setMousePositionScreen(mouse_pos.mX, mouse_pos.mY);
-                    }
-                }
-                else if (mMouseSteering)
-                {
-                    LLUI::getInstance()->setMousePositionScreen(mMouseDownX, mMouseDownY);
-                }
-                else
-                {
-                    gViewerWindow->moveCursorToCenter();
-                }
-            }
-            else
-            {
-                // not a valid zoomable object
-                LLUI::getInstance()->setMousePositionScreen(mMouseDownX, mMouseDownY);
-            }
-        }
-
-		// calls releaseMouse() internally
-		setMouseCapture(false);
-	}
-	else
-	{
-		releaseMouse();
-	}
-
-	return true;
-}
-
-
-bool LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
-{
-	S32 dx = gViewerWindow->getCurrentMouseDX();
-	S32 dy = gViewerWindow->getCurrentMouseDY();
-	
-	if (hasMouseCapture() && mValidClickPoint)
-	{
-		mAccumX += llabs(dx);
-		mAccumY += llabs(dy);
-
-		if (mAccumX >= SLOP_RANGE)
-		{
-			mOutsideSlopX = true;
-		}
-
-		if (mAccumY >= SLOP_RANGE)
-		{
-			mOutsideSlopY = true;
-		}
-	}
-
-	if (mOutsideSlopX || mOutsideSlopY)
-	{
-		if (!mValidClickPoint)
-		{
-			LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [invalid point]" << LL_ENDL;
-			gViewerWindow->setCursor(UI_CURSOR_NO);
-			gViewerWindow->showCursor();
-			return true;
-		}
-
-		if (gCameraBtnOrbit ||
-			mask == MASK_ORBIT || 
-			mask == (MASK_ALT | MASK_ORBIT))
-		{
-			// Orbit tool
-			if (hasMouseCapture())
-			{
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidthScaled();
-
-				if (dx != 0)
-				{
-					gAgentCamera.cameraOrbitAround( -dx * RADIANS_PER_PIXEL );
-				}
-
-				if (dy != 0)
-				{
-					gAgentCamera.cameraOrbitOver( -dy * RADIANS_PER_PIXEL );
-				}
-
-				gViewerWindow->moveCursorToCenter();
-			}
-			LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [active]" << LL_ENDL;
-		}
-		else if (	gCameraBtnPan ||
-					mask == MASK_PAN ||
-					mask == (MASK_PAN | MASK_ALT) )
-		{
-			// Pan tool
-			if (hasMouseCapture())
-			{
-				LLVector3d camera_to_focus = gAgentCamera.getCameraPositionGlobal();
-				camera_to_focus -= gAgentCamera.getFocusGlobal();
-				F32 dist = (F32) camera_to_focus.normVec();
-
-				// Fudge factor for pan
-				F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWorldViewWidthScaled();
-
-				if (dx != 0)
-				{
-					gAgentCamera.cameraPanLeft( dx * meters_per_pixel );
-				}
-
-				if (dy != 0)
-				{
-					gAgentCamera.cameraPanUp( -dy * meters_per_pixel );
-				}
-
-				gViewerWindow->moveCursorToCenter();
-			}
-			LL_DEBUGS("UserInput") << "hover handled by LLToolPan" << LL_ENDL;
-		}
-		else if (gCameraBtnZoom)
-		{
-			// Zoom tool
-			if (hasMouseCapture())
-			{
-
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidthScaled();
-
-				if (dx != 0)
-				{
-					gAgentCamera.cameraOrbitAround( -dx * RADIANS_PER_PIXEL );
-				}
-
-				const F32 IN_FACTOR = 0.99f;
-
-				if (dy != 0 && mOutsideSlopY )
-				{
-					if (mMouseSteering)
-					{
-						gAgentCamera.cameraOrbitOver( -dy * RADIANS_PER_PIXEL );
-					}
-					else
-					{
-						gAgentCamera.cameraZoomIn( pow( IN_FACTOR, dy ) );
-					}
-				}
-
-				gViewerWindow->moveCursorToCenter();
-			}
-
-			LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;		
-		}
-	}
-
-	if (gCameraBtnOrbit ||
-		mask == MASK_ORBIT || 
-		mask == (MASK_ALT | MASK_ORBIT))
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLCAMERA);
-	}
-	else if (	gCameraBtnPan ||
-				mask == MASK_PAN ||
-				mask == (MASK_PAN | MASK_ALT) )
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLPAN);
-	}
-	else
-	{
-		gViewerWindow->setCursor(UI_CURSOR_TOOLZOOMIN);
-	}
-	
-	return true;
-}
-
-
-void LLToolCamera::onMouseCaptureLost()
-{
-	releaseMouse();
-}
+/**

+ * @file lltoolfocus.cpp

+ * @brief A tool to set the build focus point.

+ *

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

+

+// Library includes

+#include "v3math.h"

+#include "llfontgl.h"

+#include "llui.h"

+

+// Viewer includes

+#include "llagent.h"

+#include "llagentcamera.h"

+#include "llbutton.h"

+#include "llviewercontrol.h"

+#include "lldrawable.h"

+#include "lltooltip.h"

+#include "llhudmanager.h"

+#include "llfloatertools.h"

+#include "llselectmgr.h"

+#include "llstatusbar.h"

+#include "lltoolmgr.h"

+#include "llviewercamera.h"

+#include "llviewerobject.h"

+#include "llviewerwindow.h"

+#include "llvoavatarself.h"

+#include "llmorphview.h"

+#include "llfloaterreg.h"

+#include "llfloatercamera.h"

+#include "llmenugl.h"

+

+// Globals

+bool gCameraBtnZoom = true;

+bool gCameraBtnOrbit = false;

+bool gCameraBtnPan = false;

+

+const S32 SLOP_RANGE = 4;

+

+//

+// Camera - shared functionality

+//

+

+LLToolCamera::LLToolCamera()

+:   LLTool(std::string("Camera")),

+    mAccumX(0),

+    mAccumY(0),

+    mMouseDownX(0),

+    mMouseDownY(0),

+    mOutsideSlopX(false),

+    mOutsideSlopY(false),

+    mValidClickPoint(false),

+    mClickPickPending(false),

+    mValidSelection(false),

+    mMouseSteering(false),

+    mMouseUpX(0),

+    mMouseUpY(0),

+    mMouseUpMask(MASK_NONE)

+{ }

+

+

+LLToolCamera::~LLToolCamera()

+{ }

+

+// virtual

+void LLToolCamera::handleSelect()

+{

+    if (gFloaterTools)

+    {

+        gFloaterTools->setStatusText("camera");

+        // in case we start from tools floater, we count any selection as valid

+        mValidSelection = gFloaterTools->getVisible();

+    }

+}

+

+// virtual

+void LLToolCamera::handleDeselect()

+{

+//  gAgent.setLookingAtAvatar(false);

+

+    // Make sure that temporary selection won't pass anywhere except pie tool.

+    MASK override_mask = gKeyboard ? gKeyboard->currentMask(true) : 0;

+    if (!mValidSelection && (override_mask != MASK_NONE || (gFloaterTools && gFloaterTools->getVisible())))

+    {

+        LLMenuGL::sMenuContainer->hideMenus();

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

+    }

+}

+

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

+{

+    // Ensure a mouseup

+    setMouseCapture(true);

+

+    // call the base class to propogate info to sim

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

+

+    mAccumX = 0;

+    mAccumY = 0;

+

+    mOutsideSlopX = false;

+    mOutsideSlopY = false;

+

+    mValidClickPoint = false;

+

+    // Sometimes Windows issues down and up events near simultaneously

+    // without giving async pick a chance to trigged

+    // Ex: mouse from numlock emulation

+    mClickPickPending = true;

+

+    // If mouse capture gets ripped away, claim we moused up

+    // at the point we moused down. JC

+    mMouseUpX = x;

+    mMouseUpY = y;

+    mMouseUpMask = mask;

+

+    gViewerWindow->hideCursor();

+

+    gViewerWindow->pickAsync(x, y, mask, pickCallback, /*bool pick_transparent*/ false, /*bool pick_rigged*/ false, /*bool pick_unselectable*/ true);

+

+    return true;

+}

+

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

+{

+    LLToolCamera* camera = LLToolCamera::getInstance();

+    if (!camera->mClickPickPending)

+    {

+        return;

+    }

+    camera->mClickPickPending = false;

+

+    camera->mMouseDownX = pick_info.mMousePt.mX;

+    camera->mMouseDownY = pick_info.mMousePt.mY;

+

+    gViewerWindow->moveCursorToCenter();

+

+    // Potentially recenter if click outside rectangle

+    LLViewerObject* hit_obj = pick_info.getObject();

+

+    // Check for hit the sky, or some other invalid point

+    if (!hit_obj && pick_info.mPosGlobal.isExactlyZero())

+    {

+        camera->mValidClickPoint = false;

+        return;

+    }

+

+    // check for hud attachments

+    if (hit_obj && hit_obj->isHUDAttachment())

+    {

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

+        if (!selection->getObjectCount() || selection->getSelectType() != SELECT_TYPE_HUD)

+        {

+            camera->mValidClickPoint = false;

+            return;

+        }

+    }

+

+    if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() )

+    {

+        bool good_customize_avatar_hit = false;

+        if( hit_obj )

+        {

+            if (isAgentAvatarValid() && (hit_obj == gAgentAvatarp))

+            {

+                // It's you

+                good_customize_avatar_hit = true;

+            }

+            else if (hit_obj->isAttachment() && hit_obj->permYouOwner())

+            {

+                // It's an attachment that you're wearing

+                good_customize_avatar_hit = true;

+            }

+        }

+

+        if( !good_customize_avatar_hit )

+        {

+            camera->mValidClickPoint = false;

+            return;

+        }

+

+        if( gMorphView )

+        {

+            gMorphView->setCameraDrivenByKeys( false );

+        }

+    }

+    //RN: check to see if this is mouse-driving as opposed to ALT-zoom or Focus tool

+    else if (pick_info.mKeyMask & MASK_ALT ||

+            (LLToolMgr::getInstance()->getCurrentTool()->getName() == "Camera"))

+    {

+        LLViewerObject* hit_obj = pick_info.getObject();

+        if (hit_obj)

+        {

+            // ...clicked on a world object, so focus at its position

+            if (!hit_obj->isHUDAttachment())

+            {

+                gAgentCamera.setFocusOnAvatar(false, ANIMATE);

+                gAgentCamera.setFocusGlobal(pick_info);

+            }

+        }

+        else if (!pick_info.mPosGlobal.isExactlyZero())

+        {

+            // Hit the ground

+            gAgentCamera.setFocusOnAvatar(false, ANIMATE);

+            gAgentCamera.setFocusGlobal(pick_info);

+        }

+

+        bool zoom_tool = gCameraBtnZoom && (LLToolMgr::getInstance()->getBaseTool() == LLToolCamera::getInstance());

+        if (!(pick_info.mKeyMask & MASK_ALT) &&

+            !LLFloaterCamera::inFreeCameraMode() &&

+            !zoom_tool &&

+            gAgentCamera.cameraThirdPerson() &&

+            gViewerWindow->getLeftMouseDown() &&

+            !gSavedSettings.getBOOL("FreezeTime") &&

+            (hit_obj == gAgentAvatarp ||

+             (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf())))

+        {

+            LLToolCamera::getInstance()->mMouseSteering = true;

+        }

+

+    }

+

+    camera->mValidClickPoint = true;

+

+    if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() )

+    {

+        gAgentCamera.setFocusOnAvatar(false, false);

+

+        LLVector3d cam_pos = gAgentCamera.getCameraPositionGlobal();

+

+        gAgentCamera.setCameraPosAndFocusGlobal( cam_pos, pick_info.mPosGlobal, pick_info.mObjectID);

+    }

+}

+

+

+// "Let go" of the mouse, for example on mouse up or when

+// we lose mouse capture.  This ensures that cursor becomes visible

+// if a modal dialog pops up during Alt-Zoom. JC

+void LLToolCamera::releaseMouse()

+{

+    // Need to tell the sim that the mouse button is up, since this

+    // tool is no longer working and cursor is visible (despite actual

+    // mouse button status).

+    LLTool::handleMouseUp(mMouseUpX, mMouseUpY, mMouseUpMask);

+

+    gViewerWindow->showCursor();

+

+    //for the situation when left click was performed on the Agent

+    if (!LLFloaterCamera::inFreeCameraMode())

+    {

+        LLToolMgr::getInstance()->clearTransientTool();

+    }

+

+    mMouseSteering = false;

+    mValidClickPoint = false;

+    mOutsideSlopX = false;

+    mOutsideSlopY = false;

+}

+

+

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

+{

+    // Claim that we're mousing up somewhere

+    mMouseUpX = x;

+    mMouseUpY = y;

+    mMouseUpMask = mask;

+

+    if (hasMouseCapture())

+    {

+        // Do not move camera if we haven't gotten a pick

+        if (!mClickPickPending)

+        {

+            if (mValidClickPoint)

+            {

+                if (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode())

+                {

+                    LLCoordGL mouse_pos;

+                    LLVector3 focus_pos = gAgent.getPosAgentFromGlobal(gAgentCamera.getFocusGlobal());

+                    bool success = LLViewerCamera::getInstance()->projectPosAgentToScreen(focus_pos, mouse_pos);

+                    if (success)

+                    {

+                        LLUI::getInstance()->setMousePositionScreen(mouse_pos.mX, mouse_pos.mY);

+                    }

+                }

+                else if (mMouseSteering)

+                {

+                    LLUI::getInstance()->setMousePositionScreen(mMouseDownX, mMouseDownY);

+                }

+                else

+                {

+                    gViewerWindow->moveCursorToCenter();

+                }

+            }

+            else

+            {

+                // not a valid zoomable object

+                LLUI::getInstance()->setMousePositionScreen(mMouseDownX, mMouseDownY);

+            }

+        }

+

+        // calls releaseMouse() internally

+        setMouseCapture(false);

+    }

+    else

+    {

+        releaseMouse();

+    }

+

+    return true;

+}

+

+

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

+{

+    S32 dx = gViewerWindow->getCurrentMouseDX();

+    S32 dy = gViewerWindow->getCurrentMouseDY();

+

+    if (hasMouseCapture() && mValidClickPoint)

+    {

+        mAccumX += llabs(dx);

+        mAccumY += llabs(dy);

+

+        if (mAccumX >= SLOP_RANGE)

+        {

+            mOutsideSlopX = true;

+        }

+

+        if (mAccumY >= SLOP_RANGE)

+        {

+            mOutsideSlopY = true;

+        }

+    }

+

+    if (mOutsideSlopX || mOutsideSlopY)

+    {

+        if (!mValidClickPoint)

+        {

+            LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [invalid point]" << LL_ENDL;

+            gViewerWindow->setCursor(UI_CURSOR_NO);

+            gViewerWindow->showCursor();

+            return true;

+        }

+

+        if (gCameraBtnOrbit ||

+            mask == MASK_ORBIT ||

+            mask == (MASK_ALT | MASK_ORBIT))

+        {

+            // Orbit tool

+            if (hasMouseCapture())

+            {

+                const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidthScaled();

+

+                if (dx != 0)

+                {

+                    gAgentCamera.cameraOrbitAround( -dx * RADIANS_PER_PIXEL );

+                }

+

+                if (dy != 0)

+                {

+                    gAgentCamera.cameraOrbitOver( -dy * RADIANS_PER_PIXEL );

+                }

+

+                gViewerWindow->moveCursorToCenter();

+            }

+            LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [active]" << LL_ENDL;

+        }

+        else if (   gCameraBtnPan ||

+                    mask == MASK_PAN ||

+                    mask == (MASK_PAN | MASK_ALT) )

+        {

+            // Pan tool

+            if (hasMouseCapture())

+            {

+                LLVector3d camera_to_focus = gAgentCamera.getCameraPositionGlobal();

+                camera_to_focus -= gAgentCamera.getFocusGlobal();

+                F32 dist = (F32) camera_to_focus.normVec();

+

+                // Fudge factor for pan

+                F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWorldViewWidthScaled();

+

+                if (dx != 0)

+                {

+                    gAgentCamera.cameraPanLeft( dx * meters_per_pixel );

+                }

+

+                if (dy != 0)

+                {

+                    gAgentCamera.cameraPanUp( -dy * meters_per_pixel );

+                }

+

+                gViewerWindow->moveCursorToCenter();

+            }

+            LL_DEBUGS("UserInput") << "hover handled by LLToolPan" << LL_ENDL;

+        }

+        else if (gCameraBtnZoom)

+        {

+            // Zoom tool

+            if (hasMouseCapture())

+            {

+

+                const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidthScaled();

+

+                if (dx != 0)

+                {

+                    gAgentCamera.cameraOrbitAround( -dx * RADIANS_PER_PIXEL );

+                }

+

+                const F32 IN_FACTOR = 0.99f;

+

+                if (dy != 0 && mOutsideSlopY )

+                {

+                    if (mMouseSteering)

+                    {

+                        gAgentCamera.cameraOrbitOver( -dy * RADIANS_PER_PIXEL );

+                    }

+                    else

+                    {

+                        gAgentCamera.cameraZoomIn( pow( IN_FACTOR, dy ) );

+                    }

+                }

+

+                gViewerWindow->moveCursorToCenter();

+            }

+

+            LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;

+        }

+    }

+

+    if (gCameraBtnOrbit ||

+        mask == MASK_ORBIT ||

+        mask == (MASK_ALT | MASK_ORBIT))

+    {

+        gViewerWindow->setCursor(UI_CURSOR_TOOLCAMERA);

+    }

+    else if (   gCameraBtnPan ||

+                mask == MASK_PAN ||

+                mask == (MASK_PAN | MASK_ALT) )

+    {

+        gViewerWindow->setCursor(UI_CURSOR_TOOLPAN);

+    }

+    else

+    {

+        gViewerWindow->setCursor(UI_CURSOR_TOOLZOOMIN);

+    }

+

+    return true;

+}

+

+

+void LLToolCamera::onMouseCaptureLost()

+{

+    releaseMouse();

+}