From 2de88a99d9de776ea9bc3cef293d0e3bf40f9b7e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 14 Mar 2011 13:52:53 -0700
Subject: [PATCH] SOCIAL-529 FIX Click and drag camera does not work when using
orbit and pan tools disabled click-drag when camera not in default position
since behavior would be weird at best
---
indra/newview/lltoolpie.cpp | 74 ++++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 34 deletions(-)
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index e41b84af55f..ef9f5a855c9 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -530,7 +530,9 @@ void LLToolPie::selectionPropertiesReceived()
BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
{
- if (!mMouseOutsideSlop && mMouseButtonDown && gSavedSettings.getBOOL("ClickToWalk"))
+ if (!mMouseOutsideSlop
+ && mMouseButtonDown
+ && gSavedSettings.getBOOL("ClickToWalk"))
{
S32 delta_x = x - mMouseDownX;
S32 delta_y = y - mMouseDownY;
@@ -1728,44 +1730,48 @@ bool intersect_ray_with_sphere( const LLVector3& ray_pt, const LLVector3& ray_di
void LLToolPie::startCameraSteering()
{
- mSteerPick = mPick;
-
- // handle special cases of steering picks
- LLViewerObject* avatar_object = mSteerPick.getObject();
+ mMouseOutsideSlop = true;
+ mAbortClickToWalk = true;
- // get pointer to avatar
- while (avatar_object && !avatar_object->isAvatar())
+ if (gAgentCamera.getFocusOnAvatar())
{
- avatar_object = (LLViewerObject*)avatar_object->getParent();
- }
+ mSteerPick = mPick;
- // if clicking on own avatar...
- if (avatar_object && ((LLVOAvatar*)avatar_object)->isSelf())
- {
- // ...project pick point a few meters in front of avatar
- mSteerPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * 3.0;
- }
+ // handle special cases of steering picks
+ LLViewerObject* avatar_object = mSteerPick.getObject();
- if (!mSteerPick.isValid())
- {
- mSteerPick.mPosGlobal = gAgent.getPosGlobalFromAgent(
- LLViewerCamera::instance().getOrigin() + gViewerWindow->mouseDirectionGlobal(mSteerPick.mMousePt.mX, mSteerPick.mMousePt.mY) * 100.f);
- }
+ // get pointer to avatar
+ while (avatar_object && !avatar_object->isAvatar())
+ {
+ avatar_object = (LLViewerObject*)avatar_object->getParent();
+ }
- mMouseOutsideSlop = true;
- mAbortClickToWalk = true;
- setMouseCapture(TRUE);
-
- mMouseSteerX = mMouseDownX;
- mMouseSteerY = mMouseDownY;
- const LLVector3 camera_to_rotation_center = gAgent.getFrameAgent().getOrigin() - LLViewerCamera::instance().getOrigin();
- const LLVector3 rotation_center_to_pick = gAgent.getPosAgentFromGlobal(mSteerPick.mPosGlobal) - gAgent.getFrameAgent().getOrigin();
-
- mClockwise = camera_to_rotation_center * rotation_center_to_pick < 0.f;
- mMouseSteerGrabPoint= (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
- mMouseSteerGrabPoint->setPositionGlobal(mPick.mPosGlobal);
- mMouseSteerGrabPoint->setColor(LLColor4U::white);
- mMouseSteerGrabPoint->setDuration(1000.f);
+ // if clicking on own avatar...
+ if (avatar_object && ((LLVOAvatar*)avatar_object)->isSelf())
+ {
+ // ...project pick point a few meters in front of avatar
+ mSteerPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * 3.0;
+ }
+
+ if (!mSteerPick.isValid())
+ {
+ mSteerPick.mPosGlobal = gAgent.getPosGlobalFromAgent(
+ LLViewerCamera::instance().getOrigin() + gViewerWindow->mouseDirectionGlobal(mSteerPick.mMousePt.mX, mSteerPick.mMousePt.mY) * 100.f);
+ }
+
+ setMouseCapture(TRUE);
+
+ mMouseSteerX = mMouseDownX;
+ mMouseSteerY = mMouseDownY;
+ const LLVector3 camera_to_rotation_center = gAgent.getFrameAgent().getOrigin() - LLViewerCamera::instance().getOrigin();
+ const LLVector3 rotation_center_to_pick = gAgent.getPosAgentFromGlobal(mSteerPick.mPosGlobal) - gAgent.getFrameAgent().getOrigin();
+
+ mClockwise = camera_to_rotation_center * rotation_center_to_pick < 0.f;
+ mMouseSteerGrabPoint= (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
+ mMouseSteerGrabPoint->setPositionGlobal(mPick.mPosGlobal);
+ mMouseSteerGrabPoint->setColor(LLColor4U::white);
+ mMouseSteerGrabPoint->setDuration(1000.f);
+ }
}
void LLToolPie::steerCameraWithMouse(S32 x, S32 y)
--
GitLab