From c9c03ffa0ca21eeb2786920cf9c0cb547be8a468 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 1 Dec 2011 14:52:37 -0700
Subject: fix for sh-2735: LLCurl causes SL to freeze when logout
---
indra/newview/llappviewer.cpp | 2 ++
1 file changed, 2 insertions(+)
(limited to 'indra')
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9d40a8a60e..e80475f096 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1781,6 +1781,7 @@ bool LLAppViewer::cleanup()
pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
pending += LLVFSThread::updateClass(0);
pending += LLLFSThread::updateClass(0);
+ pending += LLCurl::getCurlThread()->update(1) ;
F64 idle_time = idleTimer.getElapsedTimeF64();
if(!pending)
{
@@ -1792,6 +1793,7 @@ bool LLAppViewer::cleanup()
break;
}
}
+ LLCurl::getCurlThread()->pause() ;
// Delete workers first
// shotdown all worker threads before deleting them in case of co-dependencies
--
cgit v1.2.3