diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
| commit | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (patch) | |
| tree | e705e93230361aee2c1573f6c37d5d53abda42a0 /indra/newview/llagentcamera.cpp | |
| parent | a2fb3fabc7926dd105393391f334baa78f232640 (diff) | |
| parent | 45639aa0d1889a6cbd9223e987740d25d96ed8fd (diff) | |
automated merge
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 68e408d3e4..f0ab8bd311 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); |