summaryrefslogtreecommitdiff
path: root/indra/newview/lljoystickbutton.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-24 16:12:01 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-24 16:12:01 -0400
commitcc4a9b5640f4295c8af78efd4271a251434e39c6 (patch)
treee97f86a6968415e16f6e0d5a5a907830b9529f22 /indra/newview/lljoystickbutton.cpp
parentfc49539b36adfd4c87d7824db5d94a7858683f3d (diff)
EXT-2959 : Pull out camera functions from llagent to llagentcamera
#2 checkin. Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
Diffstat (limited to 'indra/newview/lljoystickbutton.cpp')
-rw-r--r--indra/newview/lljoystickbutton.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index 33f651284b..9e1dc3a4b0 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -627,24 +627,24 @@ void LLJoystickCameraTrack::onHeldDown()
if (dx > mVertSlopNear)
{
gAgentCamera.unlockView();
- gAgent.setPanRightKey(getOrbitRate());
+ gAgentCamera.setPanRightKey(getOrbitRate());
}
else if (dx < -mVertSlopNear)
{
gAgentCamera.unlockView();
- gAgent.setPanLeftKey(getOrbitRate());
+ gAgentCamera.setPanLeftKey(getOrbitRate());
}
// over/under rotation
if (dy > mVertSlopNear)
{
gAgentCamera.unlockView();
- gAgent.setPanUpKey(getOrbitRate());
+ gAgentCamera.setPanUpKey(getOrbitRate());
}
else if (dy < -mVertSlopNear)
{
gAgentCamera.unlockView();
- gAgent.setPanDownKey(getOrbitRate());
+ gAgentCamera.setPanDownKey(getOrbitRate());
}
}
@@ -694,25 +694,25 @@ void LLJoystickCameraZoom::onHeldDown()
{
// Zoom in fast
gAgentCamera.unlockView();
- gAgent.setOrbitInKey(FAST_RATE);
+ gAgentCamera.setOrbitInKey(FAST_RATE);
}
else if (dy > mVertSlopNear)
{
// Zoom in slow
gAgentCamera.unlockView();
- gAgent.setOrbitInKey(getOrbitRate());
+ gAgentCamera.setOrbitInKey(getOrbitRate());
}
else if (dy < -mVertSlopFar)
{
// Zoom out fast
gAgentCamera.unlockView();
- gAgent.setOrbitOutKey(FAST_RATE);
+ gAgentCamera.setOrbitOutKey(FAST_RATE);
}
else if (dy < -mVertSlopNear)
{
// Zoom out slow
gAgentCamera.unlockView();
- gAgent.setOrbitOutKey(getOrbitRate());
+ gAgentCamera.setOrbitOutKey(getOrbitRate());
}
}