summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-05 12:56:19 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-05 12:56:19 -0800
commit3390ea85822364380ccf0204810829f3b331b6ec (patch)
tree772b9af4879ca6f1e1f5fed53024186c498fdd56 /indra/newview
parentb282f04b31f60a3ddd9dcbd27eed2d2226a40e09 (diff)
DEV-44767 lookat stays locked on object/avatar after 'esc' camera reset
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermenu.cpp3
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