diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-27 14:29:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-27 14:29:11 -0500 |
| commit | 433ad05ae9580027641c8bd5e1fe175f96669a66 (patch) | |
| tree | 02d565092ac4acff9feca2840774f01790fd135e /indra/newview/llagentcamera.cpp | |
| parent | a9caa3151cea77b992c06c5a774d333ffd3016e1 (diff) | |
| parent | 9ea172a8e21913b115e676a022e80e784dfd5142 (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); |