Skip to content
Snippets Groups Projects
Commit 2de88a99 authored by Richard Linden's avatar Richard Linden
Browse files

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
parent 068a4ce9
Branches
Tags
No related merge requests found
...@@ -530,7 +530,9 @@ void LLToolPie::selectionPropertiesReceived() ...@@ -530,7 +530,9 @@ void LLToolPie::selectionPropertiesReceived()
BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) 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_x = x - mMouseDownX;
S32 delta_y = y - mMouseDownY; S32 delta_y = y - mMouseDownY;
...@@ -1727,6 +1729,11 @@ bool intersect_ray_with_sphere( const LLVector3& ray_pt, const LLVector3& ray_di ...@@ -1727,6 +1729,11 @@ bool intersect_ray_with_sphere( const LLVector3& ray_pt, const LLVector3& ray_di
} }
void LLToolPie::startCameraSteering() void LLToolPie::startCameraSteering()
{
mMouseOutsideSlop = true;
mAbortClickToWalk = true;
if (gAgentCamera.getFocusOnAvatar())
{ {
mSteerPick = mPick; mSteerPick = mPick;
...@@ -1752,8 +1759,6 @@ void LLToolPie::startCameraSteering() ...@@ -1752,8 +1759,6 @@ void LLToolPie::startCameraSteering()
LLViewerCamera::instance().getOrigin() + gViewerWindow->mouseDirectionGlobal(mSteerPick.mMousePt.mX, mSteerPick.mMousePt.mY) * 100.f); LLViewerCamera::instance().getOrigin() + gViewerWindow->mouseDirectionGlobal(mSteerPick.mMousePt.mX, mSteerPick.mMousePt.mY) * 100.f);
} }
mMouseOutsideSlop = true;
mAbortClickToWalk = true;
setMouseCapture(TRUE); setMouseCapture(TRUE);
mMouseSteerX = mMouseDownX; mMouseSteerX = mMouseDownX;
...@@ -1767,6 +1772,7 @@ void LLToolPie::startCameraSteering() ...@@ -1767,6 +1772,7 @@ void LLToolPie::startCameraSteering()
mMouseSteerGrabPoint->setColor(LLColor4U::white); mMouseSteerGrabPoint->setColor(LLColor4U::white);
mMouseSteerGrabPoint->setDuration(1000.f); mMouseSteerGrabPoint->setDuration(1000.f);
} }
}
void LLToolPie::steerCameraWithMouse(S32 x, S32 y) void LLToolPie::steerCameraWithMouse(S32 x, S32 y)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment