diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-19 07:34:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-19 07:34:35 -0500 |
| commit | 19e99a5c09274049d00f25b2d88ee6429747b084 (patch) | |
| tree | dd0bce45605b1f740dfe210738dda98dc87e7455 /indra/newview/llagentcamera.cpp | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | 634f152004f4b3938239ec2494030079f695b8ab (diff) | |
Automated merge with file:///Users/oz/Work/V-D
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); |