Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

indra/newview/llstartup.cpp

@@ -115,6 +115,7 @@
 #include "llfloaterchat.h"
 #include "llfloatergesture.h"
 #include "llfloaterhud.h"
+#include "llfloaterinventory.h"
 #include "llfloaterland.h"
 #include "llfloatertopobjects.h"
 #include "llfloatertos.h"
@@ -130,7 +131,7 @@
 #include "llimview.h" // for gIMMgr
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
-#include "llinventoryview.h"
+#include "llinventorypanel.h"
 #include "llkeyboard.h"
 #include "llloginhandler.h"			// gLoginHandler, SLURL support
 #include "llpanellogin.h"
@@ -206,7 +207,6 @@
 #include "llsocks5.h"
 #include "jcfloaterareasearch.h"
 
-
 // <edit>
 #include "llpanellogin.h"
 //#include "llfloateravatars.h"
@@ -2766,6 +2766,11 @@ bool idle_startup()
 		LL_DEBUGS("AppInit") << "Initialization complete" << LL_ENDL;
 
 		gRenderStartTime.reset();
+		// We're not allowed to call reset() when paused, and we might or might not be paused depending on
+		// whether or not the main window lost focus before we get here (see LLViewerWindow::handleFocusLost).
+		// The simplest, legal way to make sure we're unpaused is to just pause/unpause here.
+		gForegroundTime.pause();
+		gForegroundTime.unpause();
 		gForegroundTime.reset();
 
 		if (gSavedSettings.getBOOL("FetchInventoryOnLogin")