aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:53 -0500
committerJacek Antonelli2008-08-15 23:45:53 -0500
commiteea0e92faa209f23b677fdee964023d0ce6f2fed (patch)
treef8700989d9f799d4e818920ba54516e7cf975376 /linden/indra/newview/llworld.cpp
parentSecond Life viewer sources 1.20.7 (diff)
downloadmeta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.zip
meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.gz
meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.bz2
meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.xz
Second Life viewer sources 1.20.8
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
-rw-r--r--linden/indra/newview/llworld.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 27d7513..2c2440c 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -1117,7 +1117,7 @@ void send_agent_pause()
1117{ 1117{
1118 // *NOTE:Mani Pausing the mainloop timeout. Otherwise a long modal event may cause 1118 // *NOTE:Mani Pausing the mainloop timeout. Otherwise a long modal event may cause
1119 // the thread monitor to timeout. 1119 // the thread monitor to timeout.
1120 LLAppViewer::instance()->stopMainloopTimeout(); 1120 LLAppViewer::instance()->pauseMainloopTimeout();
1121 1121
1122 // Note: used to check for LLWorld initialization before it became a singleton. 1122 // Note: used to check for LLWorld initialization before it became a singleton.
1123 // Rather than just remove this check I'm changing it to assure that the message 1123 // Rather than just remove this check I'm changing it to assure that the message
@@ -1175,7 +1175,7 @@ void send_agent_resume()
1175 // Reset the FPS counter to avoid an invalid fps 1175 // Reset the FPS counter to avoid an invalid fps
1176 LLViewerStats::getInstance()->mFPSStat.start(); 1176 LLViewerStats::getInstance()->mFPSStat.start();
1177 1177
1178 LLAppViewer::instance()->startMainloopTimeout(); 1178 LLAppViewer::instance()->resumeMainloopTimeout();
1179} 1179}
1180 1180
1181 1181