summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-13 02:54:48 +0000
committerDon Kjer <don@lindenlab.com>2012-07-13 02:54:48 +0000
commit5a473a42a63d3277c65bb3bc96e49f020508cfe8 (patch)
tree9ca02ec3a6a26ddd15c6fe42f7cc2bfdcd981bef
parent3c9c7036fed46555787ad0dd545f1d8fa180ebb0 (diff)
Remove MaxFPS limit during login, teleports, and logout.
-rw-r--r--indra/newview/llappviewer.cpp7
1 files changed, 6 insertions, 1 deletions
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;