aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltexturecache.cpp')
-rw-r--r--linden/indra/newview/lltexturecache.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index ab85b32..8240f77 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -39,6 +39,9 @@
39#include "lllfsthread.h" 39#include "lllfsthread.h"
40#include "llviewercontrol.h" 40#include "llviewercontrol.h"
41 41
42// Included to allow LLTextureCache::purgeTextures() to pause watchdog timeout
43#include "llappviewer.h"
44
42#define USE_LFS_READ 0 45#define USE_LFS_READ 0
43#define USE_LFS_WRITE 0 46#define USE_LFS_WRITE 0
44 47
@@ -1155,6 +1158,9 @@ void LLTextureCache::purgeTextures(bool validate)
1155 return; 1158 return;
1156 } 1159 }
1157 1160
1161 // *FIX:Mani - watchdog off.
1162 LLAppViewer::instance()->pauseMainloopTimeout();
1163
1158 LLMutexLock lock(&mHeaderMutex); 1164 LLMutexLock lock(&mHeaderMutex);
1159 1165
1160 S32 filesize = ll_apr_file_size(mTexturesDirEntriesFileName, NULL); 1166 S32 filesize = ll_apr_file_size(mTexturesDirEntriesFileName, NULL);
@@ -1275,6 +1281,9 @@ void LLTextureCache::purgeTextures(bool validate)
1275 llassert(mTexturesSizeTotal == total_size); 1281 llassert(mTexturesSizeTotal == total_size);
1276 1282
1277 delete[] entries; 1283 delete[] entries;
1284
1285 // *FIX:Mani - watchdog back on.
1286 LLAppViewer::instance()->resumeMainloopTimeout();
1278 1287
1279 LL_INFOS("TextureCache") << "TEXTURE CACHE:" 1288 LL_INFOS("TextureCache") << "TEXTURE CACHE:"
1280 << " PURGED: " << purge_count 1289 << " PURGED: " << purge_count