diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-13 11:14:13 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-13 11:14:13 -0500 |
| commit | b01ca1293b7890ee1e2671f4a9e7b1a77a559a44 (patch) | |
| tree | 45316409d91dd5cb72e31ae9b53154469380cb99 /indra/newview/llagentcamera.cpp | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
| parent | 433ad05ae9580027641c8bd5e1fe175f96669a66 (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); |