summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-11-11 11:46:24 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-11-11 11:46:24 -0800
commit7a7f89db6d9c5e6b2c6c89ea39c0302907a0442b (patch)
treef9f962b47c1e6c3fa32c40dec4e9e804e49614cb /indra/newview/llappviewer.cpp
parent4e22d63352dd65085cfbba9c22070271ecdd4bcf (diff)
fix termination issues with thread safe queue in main loop repeater service.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c06f0c18e8..76d518b610 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -812,7 +812,7 @@ bool LLAppViewer::init()
}
// Initialize the repeater service.
- LLMainLoopRepeater::getInstance()->start();
+ LLMainLoopRepeater::instance().start();
//
// Initialize the window
@@ -1737,6 +1737,8 @@ bool LLAppViewer::cleanup()
llinfos << "File launched." << llendflush;
}
+ LLMainLoopRepeater::instance().stop();
+
ll_close_fail_log();
llinfos << "Goodbye!" << llendflush;