Ported many APR changes from Snowglobe.

1 files changed, 2 insertions, 6 deletions

diff --git a/linden/indra/llvfs/lllfsthread.cpp b/linden/indra/llvfs/lllfsthread.cpp
index 704e1ab..cd91220 100644
--- a/linden/indra/llvfs/lllfsthread.cpp
+++ b/linden/indra/llvfs/lllfsthread.cpp
@@ -73,10 +73,6 @@ LLLFSThread::LLLFSThread(bool threaded) :
         LLQueuedThread("LFS", threaded),
         mPriorityCounter(PRIORITY_LOWBITS)
 {
-        if(!mLocalAPRFilePoolp)
-        {
-                mLocalAPRFilePoolp = new LLVolatileAPRPool() ;
-        }
 }
 
 LLLFSThread::~LLLFSThread()
@@ -189,7 +185,7 @@ bool LLLFSThread::Request::processRequest()
         {
                 llassert(mOffset >= 0);
                 LLAPRFile infile ;
-                infile.open(mThread->getLocalAPRFilePool(), mFileName, LL_APR_RB);
+                infile.open(mFileName, LL_APR_RB, LLAPRFile::local);
                 if (!infile.getFileHandle())
                 {
                         llwarns << "LLLFS: Unable to read file: " << mFileName << llendl;
@@ -213,7 +209,7 @@ bool LLLFSThread::Request::processRequest()
                 if (mOffset < 0)
                         flags |= APR_APPEND;
                 LLAPRFile outfile ;
-                outfile.open(mThread->getLocalAPRFilePool(), mFileName, flags);
+                outfile.open(mFileName, flags, LLAPRFile::local);
                 if (!outfile.getFileHandle())
                 {
                         llwarns << "LLLFS: Unable to write file: " << mFileName << llendl;