From 5a473a42a63d3277c65bb3bc96e49f020508cfe8 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 13 Jul 2012 02:54:48 +0000
Subject: Remove MaxFPS limit during login, teleports, and logout.

---
 indra/newview/llappviewer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llappviewer.cpp')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f5dce58758..8210a41a78 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1492,7 +1492,12 @@ bool LLAppViewer::mainLoop()
 
 				// Limit FPS
 				F32 max_fps = gSavedSettings.getF32("MaxFPS");
-				if (max_fps > F_APPROXIMATELY_ZERO)
+				// Only limit FPS when we are actually rendering something.  Otherwise
+				// logins, logouts and teleports take much longer to complete.
+				if (max_fps > F_APPROXIMATELY_ZERO && 
+					LLStartUp::getStartupState() == STATE_STARTED &&
+					!gTeleportDisplay &&
+					!logoutRequestSent())
 				{
 					// Sleep a while to limit frame rate.
 					F32 min_frame_time = 1.f / max_fps;
-- 
cgit v1.2.3