diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-04 01:22:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-04 01:22:03 +0000 |
| commit | f5e386527c4a74e6e5733f4f1cfa55873851257e (patch) | |
| tree | 9973027da0faa63a628aa6a55b2e50a3f7fc74d9 /indra/newview/llfloatertools.cpp | |
| parent | 96add52a1c414bae4da030c3ab8604f15bd9c8db (diff) | |
QAR-427
merge 3dconnex-merge -r 84010 : 84039 -> release
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 7777544a4c..0e58363de5 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -75,7 +75,7 @@ #include "llviewerparcelmgr.h" #include "llviewerwindow.h" #include "llviewercontrol.h" - +#include "llviewerjoystick.h" #include "lluictrlfactory.h" // Globals @@ -770,6 +770,8 @@ void LLFloaterTools::onClose(bool app_quitting) setVisible(FALSE); mTab->setVisible(FALSE); + LLViewerJoystick::getInstance()->moveAvatar(true); + // Different from handle_reset_view in that it doesn't actually // move the camera if EditCameraMovement is not set. gAgent.resetView(gSavedSettings.getBOOL("EditCameraMovement")); |