Second Life viewer sources 1.18.6.0-RC

1 files changed, 26 insertions, 7 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 8b49d54..39d4a3f 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -112,6 +112,7 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
+#include "llviewerdisplay.h"
 #include "llvoavatar.h"
 #include "llvoground.h"
 #include "llvosky.h"
@@ -121,7 +122,8 @@
 #include "llworldmap.h"
 #include "pipeline.h"
 #include "roles_constants.h"
-#include "viewer.h"
+#include "llviewercontrol.h"
+#include "llappviewer.h"
 #include "llvoiceclient.h"
 
 // Ventrella
@@ -130,7 +132,6 @@
 
 extern LLMenuBarGL* gMenuBarView;
 extern U8 gLastPickAlpha;
-extern F32 gFrameDTClamped;
 
 //drone wandering constants
 const F32 MAX_WANDER_TIME = 20.f;                                               // seconds
@@ -222,6 +223,9 @@ const LLUUID BAKED_TEXTURE_HASH[BAKED_TEXTURE_COUNT] =
         LLUUID("ea800387-ea1a-14e0-56cb-24f2022f969a")
 };
 
+// The agent instance.
+LLAgent gAgent;
+
 //
 // Statics
 //
@@ -523,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)
@@ -2545,8 +2564,8 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                 LLVector3 headLookAxis;
                 LLCoordFrame frameCamera = *((LLCoordFrame*)gCamera);
 
-                F32 x_from_center = mouse_x_from_center( mouse_x );     // range from -0.5 to 0.5
-                F32 y_from_center = mouse_y_from_center( mouse_y );     // range from -0.5 to 0.5
+                F32 x_from_center = ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
+                F32 y_from_center = ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
 
                 if (cameraMouselook())
                 {
@@ -2811,7 +2830,7 @@ void LLAgent::endAnimationUpdateUI()
 
                 // HACK: If we're quitting, and we were in customize avatar, don't
                 // let the mini-map go visible again. JC
-                if (!gQuitRequested)
+        if (!LLAppViewer::instance()->quitRequested())
                 {
                         gFloaterMap->popVisible();
                 }
@@ -5836,7 +5855,7 @@ void LLAgent::requestEnterGodMode()
         msg->addBOOLFast(_PREHASH_Godlike, TRUE);
         msg->addUUIDFast(_PREHASH_Token, LLUUID::null);
 
-        // simulator and userserver need to know about your request
+        // simulators need to know about your request
         sendReliableMessage();
 }
 
@@ -5851,7 +5870,7 @@ void LLAgent::requestLeaveGodMode()
         msg->addBOOLFast(_PREHASH_Godlike, FALSE);
         msg->addUUIDFast(_PREHASH_Token, LLUUID::null);
 
-        // simulator and userserver need to know about your request
+        // simulator needs to know about your request
         sendReliableMessage();
 }