diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-05 16:27:12 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-05 16:27:12 -0500 |
commit | 2b6348654275a41494eaf4046acbc611af353a9a (patch) | |
tree | a05e15d544f7b3a489abee45021946d6302eb9b9 /indra/newview/llviewermenu.cpp | |
parent | 09326838c5f63057dc8f692c9cb100bf5f99e8e0 (diff) | |
parent | 828cf66ce33302c680834e69c775105da4ff1db2 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 15855f154d..5445a79137 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2466,7 +2466,7 @@ class LLViewJoystickFlycam : public view_listener_t class LLViewCheckJoystickFlycam : public view_listener_t { bool handleEvent(const LLSD& userdata) - { + { bool new_value = LLViewerJoystick::getInstance()->getOverrideCamera(); return new_value; } @@ -3704,6 +3704,7 @@ void reset_view_final( BOOL proceed ) } gAgent.resetView(TRUE, TRUE); + gAgent.setLookAt(LOOKAT_TARGET_CLEAR); } class LLViewLookAtLastChatter : public view_listener_t |