diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
| commit | ad991346683c9e69d3e86b0e98275cb3fa47fb72 (patch) | |
| tree | 371029c497c6453734771abc0eebb8755b841ad8 /indra/newview/llagentcamera.cpp | |
| parent | 2027ce56a217b97848f5582a14f8ed81593a1f54 (diff) | |
| parent | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (diff) | |
Automated merge with file:///Users/oz/Work/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 15f8e7bf4d..61f0201d0f 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); |