Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .

Passed QA as part of QAR-491.

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index e2463adde3..f1e0a6b55f 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1115,6 +1115,10 @@ void process_region_handshake(LLMessageSystem* msg, void** user_data)
 
 void send_agent_pause()
 {
+	// *NOTE:Mani Pausing the mainloop timeout. Otherwise a long modal event may cause
+	// the thread monitor to timeout.
+	LLAppViewer::instance()->stopMainloopTimeout();
+	
 	// Note: used to check for LLWorld initialization before it became a singleton.
 	// Rather than just remove this check I'm changing it to assure that the message 
 	// system has been initialized. -MG
@@ -1170,6 +1174,8 @@ void send_agent_resume()
 
 	// Reset the FPS counter to avoid an invalid fps
 	LLViewerStats::getInstance()->mFPSStat.start();
+
+	LLAppViewer::instance()->startMainloopTimeout();
 }