diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-14 11:07:07 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-14 11:07:07 -0400 |
commit | a4f2c570dd42066f0e2738a0fd2de6c61c35b47b (patch) | |
tree | 8131c27f3329bb5677da695841cf917c434db74d /indra/newview/llagentcamera.cpp | |
parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) | |
parent | 19e99a5c09274049d00f25b2d88ee6429747b084 (diff) |
update to latest viewer-development
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r-- | indra/newview/llagentcamera.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index f01d5ff1f5..4118b1df98 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -277,6 +277,7 @@ LLAgentCamera::~LLAgentCamera() //----------------------------------------------------------------------------- void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) { + if (TRUE) return; // Disabling reset for avatar physics demo-ing. if (gAgent.getAutoPilot()) { gAgent.stopAutoPilot(TRUE); |