diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-06 17:23:08 +0200 |
| commit | 3a7e3c4328684f9f52f14f7d4cb13ecf5d803ff4 (patch) | |
| tree | 61320af8ba979cec97b53c1b76ce96a2769d064f /indra/newview/llviewermenu.cpp | |
| parent | 6ee29d8c2a2b7a47f62d7a391106084e704cd544 (diff) | |
| parent | fc785febb332442533c20b638132b8ab378732a9 (diff) | |
merge
--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 |