diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-06 12:58:33 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-06 12:58:33 +0200 |
| commit | aa5aff1d79ea605f909efdbabde6dec853d54a90 (patch) | |
| tree | 99ed950508998ba8b9ceb951b09d94e8b7e053a4 /indra/newview/llviewermenu.cpp | |
| parent | a22df89f3b790afe993b217c6217ff5e61f337d5 (diff) | |
| parent | 93417fe004b831f73f0c0c9906e93237d74ed589 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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 |