diff options
| author | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
| commit | c1920e3c1c60fb792cf091750b05de618b355878 (patch) | |
| tree | 204b78e0f0b87fb2875b90af0f579d53e3138cbb /indra/newview/llagent.cpp | |
| parent | 760f2ceb1518d87e865f25ac87a540625e974517 (diff) | |
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 54f6741fee..d7e316438c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -527,6 +527,21 @@ void LLAgent::resetView(BOOL reset_camera) } } +// Handle any actions that need to be performed when the main app gains focus +// (such as through alt-tab). +//----------------------------------------------------------------------------- +// onAppFocusGained() +//----------------------------------------------------------------------------- +void LLAgent::onAppFocusGained() +{ + if (CAMERA_MODE_MOUSELOOK == mCameraMode) + { + changeCameraToDefault(); + gToolMgr->clearSavedTool(); + } +} + + void LLAgent::ageChat() { if (mAvatarObject) |