diff options
| -rw-r--r-- | indra/llfilesystem/lldiskcache.cpp | 16 | ||||
| -rw-r--r-- | indra/llfilesystem/lldiskcache.h | 3 | 
2 files changed, 5 insertions, 14 deletions
diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index c0f10ac620..6b0bbaeb48 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -31,6 +31,7 @@   */  #include "linden_common.h" +#include "llapp.h"  #include "llassettype.h"  #include "lldir.h"  #include <boost/filesystem.hpp> @@ -371,17 +372,10 @@ LLPurgeDiskCacheThread::LLPurgeDiskCacheThread() :  void LLPurgeDiskCacheThread::run()  { -    constexpr F64 CHECK_INTERVAL = 60; -    mTimer.setTimerExpirySec(CHECK_INTERVAL); -    mTimer.start(); +    constexpr long CHECK_INTERVAL = 60; -    do +    while (LLApp::instance()->sleep(std::chrono::seconds(CHECK_INTERVAL)))      { -        if (mTimer.checkExpirationAndReset(CHECK_INTERVAL)) -        { -            LLDiskCache::instance().purge(); -        } - -        ms_sleep(100); -    } while (!isQuitting()); +        LLDiskCache::instance().purge(); +    }  } diff --git a/indra/llfilesystem/lldiskcache.h b/indra/llfilesystem/lldiskcache.h index 268fe92bcc..1cbd2c58aa 100644 --- a/indra/llfilesystem/lldiskcache.h +++ b/indra/llfilesystem/lldiskcache.h @@ -194,8 +194,5 @@ public:  protected:      void run() override; - -private: -    LLTimer mTimer;  };  #endif // _LLDISKCACHE  | 
