diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
| commit | 634f152004f4b3938239ec2494030079f695b8ab (patch) | |
| tree | d59e9b3e37c93c141829aec44bf4da4e59d7ad10 /indra/newview/llagentcamera.cpp | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
| parent | 99d4f573517085ac602514672eab8a45dc002823 (diff) | |
merge up 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); |