diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:25:12 -0400 |
| commit | b2ade764a91ad1b7edcf6e21af76430f670f54fb (patch) | |
| tree | c022033f90401e6d2bf77c365540b26aa1b3eaa9 /indra/newview/llagentcamera.cpp | |
| parent | 8d408673e1769dbe435065c4fcf29995c3ce2f3c (diff) | |
| parent | c5abb4b116d0b31a74059dcb4b338654ca7bedfe (diff) | |
merge latest avatar-physics updates
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); |