21 files changed, 549 insertions, 90 deletions
diff --git a/linden/indra/llvfs/CMakeLists.txt b/linden/indra/llvfs/CMakeLists.txt
index c3c12ef..cc0297e 100644
--- a/linden/indra/llvfs/CMakeLists.txt
+++ b/linden/indra/llvfs/CMakeLists.txt
@@ -13,6 +13,7 @@ include_directories(
 set(llvfs_SOURCE_FILES
    lldir.cpp
    lllfsthread.cpp
+    llpidlock.cpp
    llvfile.cpp
    llvfs.cpp
    llvfsthread.cpp
@@ -23,6 +24,7 @@ set(llvfs_HEADER_FILES
    lldir.h
    lllfsthread.h
+    llpidlock.h
    llvfile.h
    llvfs.h
    llvfsthread.h
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index eb705dd..29a3771 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -215,30 +216,44 @@ const std::string  LLDir::getCacheDir(bool get_default) const
 {
        if (mCacheDir.empty() || get_default)
        {
-                std::string res;
+                if (!mDefaultCacheDir.empty())
-                if (getOSCacheDir().empty())
+                {       // Set at startup - can't set here due to const API
+                        return mDefaultCacheDir;
+                }
+                
+                std::string res = buildSLOSCacheDir();
+                return res;
+        }
+        else
+        {
+                return mCacheDir;
+        }
+}
+// Return the default cache directory
+std::string LLDir::buildSLOSCacheDir() const
+{
+        std::string res;
+        if (getOSCacheDir().empty())
+        {
+                if (getOSUserAppDir().empty())
                {
-                        if (getOSUserAppDir().empty())
+                        res = "data";
-                        {
-                                res = "data";
-                        }
-                        else
-                        {
-                                res = getOSUserAppDir() + mDirDelimiter + "cache";
-                        }
                }
                else
                {
-                        res = getOSCacheDir() + mDirDelimiter + "Imprudence";
+                        res = getOSUserAppDir() + mDirDelimiter + "cache";
                }
-                return res;
        }
        else
        {
-                return mCacheDir;
+                res = getOSCacheDir() + mDirDelimiter + "Imprudence";
        }
+        return res;
 }
 const std::string &LLDir::getOSCacheDir() const
 {
        return mOSCacheDir;
@@ -378,7 +393,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
        case LL_PATH_EXECUTABLE:
                prefix = getExecutableDir();
                break;
+                
        default:
                llassert(0);
        }
@@ -418,7 +433,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
                expanded_filename.assign("");
        }
-        //llinfos << "*** EXPANDED FILENAME: <" << mExpandedFilename << ">" << llendl;
+        //llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl;
        return expanded_filename;
 }
@@ -654,6 +669,11 @@ void LLDir::dumpCurrentDirectories()
        LL_DEBUGS2("AppInit","Directories") << "  TempDir:               " << getTempDir() << LL_ENDL;
        LL_DEBUGS2("AppInit","Directories") << "  CAFile:                                " << getCAFile() << LL_ENDL;
        LL_DEBUGS2("AppInit","Directories") << "  SkinDir:               " << getSkinDir() << LL_ENDL;
+#if LL_LIBXUL_ENABLED
+        LL_DEBUGS2("AppInit","Directories") << "  HTML Path:             " << getExpandedFilename( LL_PATH_HTML, "" ) << llendl;
+        LL_DEBUGS2("AppInit","Directories") << "  Mozilla Profile Path:  " << getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) << llendl;
+#endif
 }
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 4ab5d85..21dcf5b 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -32,6 +33,11 @@
 #ifndef LL_LLDIR_H
 #define LL_LLDIR_H
+#if LL_SOLARIS
+#include <sys/param.h>
+#define MAX_PATH MAXPATHLEN
+#endif
 // these numbers *may* get serialized, so we need to be explicit
 typedef enum ELLPath
 {
@@ -126,6 +132,9 @@ class LLDir
        virtual void dumpCurrentDirectories();
        
+        // Utility routine
+        std::string buildSLOSCacheDir() const;
 protected:
        std::string mAppName;               // install directory under progams/ ie "SecondLife"   
        std::string mExecutablePathAndName; // full path + Filename of .exe
@@ -140,8 +149,9 @@ protected:
        std::string mChatLogsDir;                // Location for chat logs.
        std::string mCAFile;                             // Location of the TLS certificate authority PEM file.
        std::string mTempDir;
-        std::string mCacheDir;
+        std::string mCacheDir;                  // cache directory as set by user preference
-        std::string mOSCacheDir;
+        std::string mDefaultCacheDir;   // default cache diretory
+        std::string mOSCacheDir;                // operating system cache dir
        std::string mDirDelimiter;
        std::string mSkinDir;                   // Location for current skin info.
        std::string mDefaultSkinDir;                    // Location for default skin info.
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index ce8806a..8ff8c5d 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/lldir_linux.h b/linden/indra/llvfs/lldir_linux.h
index 09a27a7..20b408f 100644
--- a/linden/indra/llvfs/lldir_linux.h
+++ b/linden/indra/llvfs/lldir_linux.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index f61fa74..6d5dcf3 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/lldir_mac.h b/linden/indra/llvfs/lldir_mac.h
index 8288bf8..28d48a0 100644
--- a/linden/indra/llvfs/lldir_mac.h
+++ b/linden/indra/llvfs/lldir_mac.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index adbe747..9553d92 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -36,14 +37,13 @@
 #include "llrand.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/param.h>
 #include <unistd.h>
 #include <glob.h>
 #include <pwd.h>
 #include <sys/utsname.h>
 #define _STRUCTURED_PROC 1
 #include <sys/procfs.h>
+#include <fcntl.h>
 static std::string getCurrentUserHome(char* fallback)
 {
@@ -82,7 +82,16 @@ LLDir_Solaris::LLDir_Solaris()
        mDirp = NULL;
        char tmp_str[LL_MAX_PATH];      /* Flawfinder: ignore */ 
-        getcwd(tmp_str, LL_MAX_PATH);
+        if (getcwd(tmp_str, LL_MAX_PATH) == NULL)
+        {
+                strcpy(tmp_str, "/tmp");
+                llwarns << "Could not get current directory; changing to "
+                                << tmp_str << llendl;
+                if (chdir(tmp_str) == -1)
+                {
+                        llerrs << "Could not change directory to " << tmp_str << llendl;
+                }
+        }
        mExecutableFilename = "";
        mExecutablePathAndName = "";
@@ -121,20 +130,35 @@ LLDir_Solaris::LLDir_Solaris()
                return;
        }
+        char *p = execpath;                     // nuke trash in link, if any exists
+        int i = 0;
+        while(*p != NULL && ++i < LL_MAX_PATH && isprint((int)(*p++)));
+        *p = NULL;
        mExecutablePathAndName = strdup(execpath);
        llinfos << "mExecutablePathAndName = [" << mExecutablePathAndName << "]" << llendl;
+        //NOTE: Why force people to cd into the package directory?
+        //      Look for SECONDLIFE env variable and use it, if set.
+        char *dcf = getenv("SECONDLIFE");
+        if(dcf != NULL){
+                (void)strcpy(path, dcf);
+                (void)strcat(path, "/bin");     //NOTE:  make sure we point at the bin
+                mExecutableDir = strdup(path);
+        }else{
                        // plunk a null at last '/' to get exec dir
-        char *s = execpath + strlen(execpath) -1;
+                char *s = execpath + strlen(execpath) -1;
-        while(*s != '/' && s != execpath){
+                while(*s != '/' && s != execpath){
-                --s;
+                        --s;
-        }
+                }
        
-        if(s != execpath){
+                if(s != execpath){
-                *s = (char)NULL;
+                        *s = (char)NULL;
        
-                mExecutableDir = strdup(execpath);
+                        mExecutableDir = strdup(execpath);
-                llinfos << "mExecutableDir = [" << mExecutableDir << "]" << llendl;
+                        llinfos << "mExecutableDir = [" << mExecutableDir << "]" << llendl;
+                }
        }
        
        // *TODO: don't use /tmp, use $HOME/.secondlife/tmp or something.
@@ -354,12 +378,16 @@ void LLDir_Solaris::getRandomFileInDir(const std::string &dirname, const std::st
 std::string LLDir_Solaris::getCurPath()
 {
        char tmp_str[LL_MAX_PATH];      /* Flawfinder: ignore */ 
-        getcwd(tmp_str, LL_MAX_PATH);
+        if (getcwd(tmp_str, LL_MAX_PATH) == NULL)
+        {
+                llwarns << "Could not get current directory" << llendl;
+                tmp_str[0] = '\0';
+        }
        return tmp_str;
 }
-BOOL LLDir_Solaris::fileExists(const std::string &filename)
+BOOL LLDir_Solaris::fileExists(const std::string &filename) const
 {
        struct stat stat_data;
        // Check the age of the file
diff --git a/linden/indra/llvfs/lldir_solaris.h b/linden/indra/llvfs/lldir_solaris.h
index dea397d..139754b 100644
--- a/linden/indra/llvfs/lldir_solaris.h
+++ b/linden/indra/llvfs/lldir_solaris.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -49,7 +50,7 @@ public:
        virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
        virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
        virtual void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
-        /*virtual*/ BOOL fileExists(const std::string &filename);
+        /*virtual*/ BOOL fileExists(const std::string &filename) const;
 private:
        DIR *mDirp;
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 8703a0f..19b9bcc 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -58,14 +59,18 @@ LLDir_Win32::LLDir_Win32()
        mOSUserDir = utf16str_to_utf8str(llutf16string(w_str));
-        // Local Settings\Application Data is where cache files should
+        // We want cache files to go on the local disk, even if the
-        // go, they don't get copied to the server if the user moves his
+        // user is on a network with a "roaming profile".
-        // profile around on the network. JC
        //
-        // TODO: patch the installer to remove old cache files on update, then
+        // On XP this is:
-        // enable this code.
+        //   C:\Docments and Settings\James\Local Settings\Application Data
-        //SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
+        // On Vista this is:
-        //mOSUserCacheDir = utf16str_to_utf8str(llutf16string(w_str));
+        //   C:\Users\James\AppData\Local
+        //
+        // We used to store the cache in AppData\Roaming, and the installer
+        // cleans up that version on upgrade.  JC
+        SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
+        mOSCacheDir = utf16str_to_utf8str(llutf16string(w_str));
        if (GetTempPath(MAX_PATH, w_str))
        {
@@ -124,6 +129,20 @@ LLDir_Win32::LLDir_Win32()
                mAppRODataDir = getCurPath();
        else
                mAppRODataDir = mExecutableDir;
+        // Build the default cache directory
+        mDefaultCacheDir = buildSLOSCacheDir();
+        
+        // Make sure it exists
+        int res = LLFile::mkdir(mDefaultCacheDir);
+        if (res == -1)
+        {
+                if (errno != EEXIST)
+                {
+                        llwarns << "Couldn't create LL_PATH_CACHE dir " << mDefaultCacheDir << llendl;
+                }
+        }
 }
 LLDir_Win32::~LLDir_Win32()
diff --git a/linden/indra/llvfs/lldir_win32.h b/linden/indra/llvfs/lldir_win32.h
index 25bb276..8710ca5 100644
--- a/linden/indra/llvfs/lldir_win32.h
+++ b/linden/indra/llvfs/lldir_win32.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/lllfsthread.cpp b/linden/indra/llvfs/lllfsthread.cpp
index bdcf61f..704e1ab 100644
--- a/linden/indra/llvfs/lllfsthread.cpp
+++ b/linden/indra/llvfs/lllfsthread.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -72,6 +73,10 @@ LLLFSThread::LLLFSThread(bool threaded) :
        LLQueuedThread("LFS", threaded),
        mPriorityCounter(PRIORITY_LOWBITS)
 {
+        if(!mLocalAPRFilePoolp)
+        {
+                mLocalAPRFilePoolp = new LLVolatileAPRPool() ;
+        }
 }
 LLLFSThread::~LLLFSThread()
@@ -183,8 +188,9 @@ bool LLLFSThread::Request::processRequest()
        if (mOperation ==  FILE_READ)
        {
                llassert(mOffset >= 0);
-                apr_file_t* filep = ll_apr_file_open(mFileName, LL_APR_RB, mThread->mAPRPoolp);
+                LLAPRFile infile ;
-                if (!filep)
+                infile.open(mThread->getLocalAPRFilePool(), mFileName, LL_APR_RB);
+                if (!infile.getFileHandle())
                {
                        llwarns << "LLLFS: Unable to read file: " << mFileName << llendl;
                        mBytesRead = 0; // fail
@@ -192,13 +198,13 @@ bool LLLFSThread::Request::processRequest()
                }
                S32 off;
                if (mOffset < 0)
-                        off = ll_apr_file_seek(filep, APR_END, 0);
+                        off = infile.seek(APR_END, 0);
                else
-                        off = ll_apr_file_seek(filep, APR_SET, mOffset);
+                        off = infile.seek(APR_SET, mOffset);
                llassert_always(off >= 0);
-                mBytesRead = ll_apr_file_read(filep, mBuffer, mBytes );
+                mBytesRead = infile.read(mBuffer, mBytes );
-                apr_file_close(filep);
                complete = true;
+                infile.close() ;
 //              llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl;
        }
        else if (mOperation ==  FILE_WRITE)
@@ -206,8 +212,9 @@ bool LLLFSThread::Request::processRequest()
                apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
                if (mOffset < 0)
                        flags |= APR_APPEND;
-                apr_file_t* filep = ll_apr_file_open(mFileName, flags, mThread->mAPRPoolp);
+                LLAPRFile outfile ;
-                if (!filep)
+                outfile.open(mThread->getLocalAPRFilePool(), mFileName, flags);
+                if (!outfile.getFileHandle())
                {
                        llwarns << "LLLFS: Unable to write file: " << mFileName << llendl;
                        mBytesRead = 0; // fail
@@ -215,18 +222,17 @@ bool LLLFSThread::Request::processRequest()
                }
                if (mOffset >= 0)
                {
-                        S32 seek = ll_apr_file_seek(filep, APR_SET, mOffset);
+                        S32 seek = outfile.seek(APR_SET, mOffset);
                        if (seek < 0)
                        {
-                                apr_file_close(filep);
                                llwarns << "LLLFS: Unable to write file (seek failed): " << mFileName << llendl;
                                mBytesRead = 0; // fail
                                return true;
                        }
                }
-                mBytesRead = ll_apr_file_write(filep, mBuffer, mBytes );
+                mBytesRead = outfile.write(mBuffer, mBytes );
                complete = true;
-                apr_file_close(filep);
 //              llinfos << "LLLFSThread::WRITE:" << mFileName << " Bytes: " << mBytesRead << "/" << mBytes << " Offset:" << mOffset << llendl;
        }
        else
diff --git a/linden/indra/llvfs/lllfsthread.h b/linden/indra/llvfs/lllfsthread.h
index a344282..5a11cb3 100644
--- a/linden/indra/llvfs/lllfsthread.h
+++ b/linden/indra/llvfs/lllfsthread.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/llpidlock.cpp b/linden/indra/llvfs/llpidlock.cpp
new file mode 100755
index 0000000..93ac120
--- /dev/null
+++ b/linden/indra/llvfs/llpidlock.cpp
@@ -0,0 +1,269 @@
+/** 
+ * @file llformat.cpp
+ * @date   January 2007
+ * @brief string formatting utility
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+#include "llpidlock.h"
+#include "lldir.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llnametable.h"
+#include "llframetimer.h"
+#if LL_WINDOWS   //For windows platform.
+bool isProcessAlive(U32 pid)
+{
+        return (bool) GetProcessVersion((DWORD)pid);
+}
+#else   //Everyone Else
+bool isProcessAlive(U32 pid)
+{   
+        return (bool) kill( (pid_t)pid, 0);
+}
+#endif //Everyone else.
+        
+class LLPidLockFile
+{
+        public:
+                LLPidLockFile( ) :
+                        mSaving(FALSE), mWaiting(FALSE), 
+                        mClean(TRUE), mPID(getpid())
+                {
+                        mLockName = gDirUtilp->getTempDir() + "/savelock";
+                }
+                bool requestLock(LLNameTable<void *> *name_table, bool autosave,
+                                                bool force_immediate=FALSE, F32 timeout=300.0);
+                bool checkLock();
+                void releaseLock();
+        private:
+                void writeLockFile(LLSD pids);
+        public:
+                static LLPidLockFile& instance(); // return the singleton black list file
+                         
+                bool mAutosave;
+                bool mSaving;
+                bool mWaiting;
+                LLFrameTimer mTimer;
+                U32  mPID;
+                std::string mLockName;
+                std::string mSaveName;
+                LLSD mPIDS_sd;
+                LLNameTable<void*> *mNameTable;
+                bool mClean;
+};
+LLPidLockFile& LLPidLockFile::instance()
+{   
+        static LLPidLockFile the_file;
+        return the_file;
+}
+void LLPidLockFile::writeLockFile(LLSD pids)
+{
+        llofstream ofile(mLockName);
+        if (!LLSDSerialize::toXML(pids,ofile))
+        {
+                llwarns << "Unable to write concurrent save lock file." << llendl;
+        }
+        ofile.close();
+}
+bool LLPidLockFile::requestLock(LLNameTable<void *> *name_table, bool autosave,
+                                                                bool force_immediate, F32 timeout)
+{
+        bool readyToSave = FALSE;
+        if (mSaving) return FALSE;      //Bail out if we're currently saving.  Will not queue another save.
+        
+        if (!mWaiting){
+                mNameTable=name_table;
+                mAutosave = autosave;
+        }
+        LLSD out_pids;
+        out_pids.append( (LLSD::Integer)mPID );
+        llifstream ifile(mLockName);
+        if (ifile.is_open()) 
+        {                                                                       //If file exists, we need to decide whether or not to continue.
+                if ( force_immediate
+                        || mTimer.hasExpired() )        //Only deserialize if we REALLY need to.
+                {
+                        LLSD in_pids;
+                        LLSDSerialize::fromXML(in_pids, ifile); 
+                        //Clean up any dead PIDS that might be in there.
+                        for (LLSD::array_iterator i=in_pids.beginArray();
+                                i !=in_pids.endArray();
+                                ++i)
+                        {
+                                U32 stored_pid=(*i).asInteger();
+                                if (isProcessAlive(stored_pid))
+                                {
+                                        out_pids.append( (*i) );
+                                }
+                        }
+                        readyToSave=TRUE;
+                }
+                ifile.close();
+        }
+        else
+        {
+                readyToSave=TRUE;
+        }
+        if (!mWaiting)                          //Not presently waiting to save.  Queue up.
+        {
+                mTimer.resetWithExpiry(timeout);
+                mWaiting=TRUE;
+        }
+        if (readyToSave)
+        {       //Potential race condition won't kill us. Ignore it.
+                writeLockFile(out_pids);
+                mSaving=TRUE;
+        }
+        
+        return readyToSave;
+}
+bool LLPidLockFile::checkLock()
+{
+        return mWaiting;
+}
+void LLPidLockFile::releaseLock()
+{
+        llifstream ifile(mLockName);
+        LLSD in_pids;
+        LLSD out_pids;
+        bool write_file=FALSE;
+        LLSDSerialize::fromXML(in_pids, ifile); 
+        //Clean up this PID and any dead ones.
+        for (LLSD::array_iterator i=in_pids.beginArray();
+                i !=in_pids.endArray();
+                ++i)
+        {
+                U32 stored_pid=(*i).asInteger();
+                if (stored_pid != mPID && isProcessAlive(stored_pid))
+                {
+                        out_pids.append( (*i) );
+                        write_file=TRUE;
+                }
+        }
+        ifile.close();
+        if (write_file)
+        {
+                writeLockFile(out_pids);
+        }
+        else
+        {
+                unlink(mLockName.c_str());
+        }
+        mSaving=FALSE;
+        mWaiting=FALSE;
+}
+//LLPidLock
+void LLPidLock::initClass() { 
+        (void) LLPidLockFile::instance(); 
+}
+bool LLPidLock::checkLock() 
+{
+        return LLPidLockFile::instance().checkLock();
+}
+bool LLPidLock::requestLock(LLNameTable<void *> *name_table, bool autosave,
+                                                                bool force_immediate, F32 timeout)
+{
+        return LLPidLockFile::instance().requestLock(name_table,autosave,force_immediate,timeout);
+}
+void LLPidLock::releaseLock() 
+{ 
+        return LLPidLockFile::instance().releaseLock(); 
+}
+bool LLPidLock::isClean() 
+{ 
+        return LLPidLockFile::instance().mClean; 
+}
+//getters
+LLNameTable<void *> * LLPidLock::getNameTable() 
+{ 
+    return LLPidLockFile::instance().mNameTable; 
+}
+bool LLPidLock::getAutosave() 
+{ 
+        return LLPidLockFile::instance().mAutosave; 
+}
+bool LLPidLock::getClean() 
+{ 
+        return LLPidLockFile::instance().mClean; 
+}
+std::string LLPidLock::getSaveName() 
+{ 
+        return LLPidLockFile::instance().mSaveName; 
+}
+//setters
+void LLPidLock::setClean(bool clean) 
+{ 
+        LLPidLockFile::instance().mClean=clean; 
+}
+void LLPidLock::setSaveName(std::string savename) 
+{ 
+        LLPidLockFile::instance().mSaveName=savename; 
+}
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h
new file mode 100755
index 0000000..42aee4d
--- /dev/null
+++ b/linden/indra/llvfs/llpidlock.h
@@ -0,0 +1,73 @@
+/** 
+ * @file llpidlock.h
+ * @brief System information debugging classes.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_PIDLOCK_H
+#define LL_PIDLOCK_H
+#include "llnametable.h"
+class LLSD;
+class LLFrameTimer;
+#if LL_WINDOWS  //For windows platform.
+#include <windows.h>
+#define getpid GetCurrentProcessId
+#else   //Everyone Else
+#include <signal.h>
+#endif //Everyone else.
+namespace LLPidLock
+{
+    void initClass(); // { (void) LLPidLockFile::instance(); }
+        bool requestLock( LLNameTable<void *> *name_table=NULL, bool autosave=TRUE,
+                                          bool force_immediate=FALSE, F32 timeout=300.0);
+        bool checkLock(); 
+        void releaseLock(); 
+        bool isClean(); 
+        //getters
+        LLNameTable<void *> * getNameTable(); 
+        bool getAutosave(); 
+        bool getClean(); 
+        std::string getSaveName(); 
+        //setters
+        void setClean(bool clean); 
+        void setSaveName(std::string savename); 
+};
+#endif // LL_PIDLOCK_H
diff --git a/linden/indra/llvfs/llvfile.cpp b/linden/indra/llvfs/llvfile.cpp
index 085c36c..6b1563b 100644
--- a/linden/indra/llvfs/llvfile.cpp
+++ b/linden/indra/llvfs/llvfile.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/llvfile.h b/linden/indra/llvfs/llvfile.h
index 16fa779..5f69a41 100644
--- a/linden/indra/llvfs/llvfile.h
+++ b/linden/indra/llvfs/llvfile.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index d6c9278..e5ffce4 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -231,7 +232,7 @@ struct LLVFSFileBlock_less
 const S32 LLVFSFileBlock::SERIAL_SIZE = 34;
     
-    
 LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)
 :       mRemoveAfterCrash(remove_after_crash)
 {
@@ -399,6 +400,12 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
                                mDataFP = NULL;
                                LLFile::remove( mDataFilename );
+                                LL_WARNS("VFS") << "Deleted corrupt VFS files " 
+                                        << mDataFilename 
+                                        << " and "
+                                        << mIndexFilename
+                                        << LL_ENDL;
                                mValid = VFSVALID_BAD_CORRUPT;
                                return;
                        }
@@ -504,6 +511,13 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
                                                << " ID " << cur_file_block->mFileID 
                                                << " type " << cur_file_block->mFileType 
                                                << LL_ENDL;
+                                        LL_WARNS("VFS") << "Deleted corrupt VFS files " 
+                                                << mDataFilename 
+                                                << " and "
+                                                << mIndexFilename
+                                                << LL_ENDL;
                                        mValid = VFSVALID_BAD_CORRUPT;
                                        return;
                                }
@@ -717,8 +731,14 @@ S32  LLVFS::getMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type
 BOOL LLVFS::checkAvailable(S32 max_size)
 {
+        lockData();
+        
        blocks_length_map_t::iterator iter = mFreeBlocksByLength.lower_bound(max_size); // first entry >= size
-        return (iter == mFreeBlocksByLength.end()) ? FALSE : TRUE;
+        const BOOL res(iter == mFreeBlocksByLength.end() ? FALSE : TRUE);
+        unlockData();
+        
+        return res;
 }
 BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type, S32 max_size)
@@ -824,13 +844,20 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type
    
                        if (free_block)
                        {
+                                // Save location where data is going, useFreeSpace will move free_block->mLocation;
+                                U32 new_data_location = free_block->mLocation;
+                                //mark the free block as used so it does not
+                                //interfere with other operations such as addFreeBlock
+                                useFreeSpace(free_block, max_size);             // useFreeSpace takes ownership (and may delete) free_block
                                if (block->mLength > 0)
                                {
                                        // create a new free block where this file used to be
                                        LLVFSBlock *new_free_block = new LLVFSBlock(block->mLocation, block->mLength);
                                        addFreeBlock(new_free_block);
-    
+                                        
                                        if (block->mSize > 0)
                                        {
                                                // move the file into the new block
@@ -838,7 +865,7 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type
                                                fseek(mDataFP, block->mLocation, SEEK_SET);
                                                if (fread(buffer, block->mSize, 1, mDataFP) == 1)
                                                {
-                                                        fseek(mDataFP, free_block->mLocation, SEEK_SET);
+                                                        fseek(mDataFP, new_data_location, SEEK_SET);
                                                        if (fwrite(buffer, block->mSize, 1, mDataFP) != 1)
                                                        {
                                                                llwarns << "Short write" << llendl;
@@ -851,13 +878,10 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type
                                        }
                                }
    
-                                block->mLocation = free_block->mLocation;
+                                block->mLocation = new_data_location;
    
                                block->mLength = max_size;
-                                // Must call useFreeSpace before sync(), as sync()
-                                // unlocks data structures.
-                                useFreeSpace(free_block, max_size);
                                sync(block);
@@ -1072,14 +1096,14 @@ S32 LLVFS::getData(const LLUUID &file_id, const LLAssetType::EType file_type, U8
                }
        }
-        unlockData();
        if (do_read)
        {
                fseek(mDataFP, location, SEEK_SET);
                bytesread = (S32)fread(buffer, 1, length, mDataFP);
        }
        
+        unlockData();
        return bytesread;
 }
    
@@ -1144,8 +1168,6 @@ S32 LLVFS::storeData(const LLUUID &file_id, const LLAssetType::EType file_type,
                        }
                        U32 file_location = location + block->mLocation;
                        
-                        unlockData();
-                        
                        fseek(mDataFP, file_location, SEEK_SET);
                        S32 write_len = (S32)fwrite(buffer, 1, length, mDataFP);
                        if (write_len != length)
@@ -1154,7 +1176,6 @@ S32 LLVFS::storeData(const LLUUID &file_id, const LLAssetType::EType file_type,
                        }
                        // fflush(mDataFP);
                        
-                        lockData();
                        if (location + length > block->mSize)
                        {
                                block->mSize = location + write_len;
@@ -1403,7 +1424,7 @@ void LLVFS::addFreeBlock(LLVFSBlock *block)
 //      }
 //}
        
+// length bytes from free_block are going to be used (so they are no longer free)
 void LLVFS::useFreeSpace(LLVFSBlock *free_block, S32 length)
 {
        if (free_block->mLength == length)
@@ -1486,8 +1507,6 @@ void LLVFS::sync(LLVFSFileBlock *block, BOOL remove)
                block->serialize(buffer);
        }
-        unlockData();
        // If set_index_to_end, file pointer is already at seek_pos
        // and we don't need to do anything.  Only seek if not at end.
        if (!set_index_to_end)
@@ -1499,11 +1518,10 @@ void LLVFS::sync(LLVFSFileBlock *block, BOOL remove)
        {
                llwarns << "Short write" << llendl;
        }
-        
+        // *NOTE:  Why was this commented out?
        // fflush(mIndexFP);
        
-        lockData();
-        
        return;
 }
@@ -2069,9 +2087,11 @@ void LLVFS::dumpFiles()
                        std::string extension = get_extension(type);
                        std::string filename = id.asString() + extension;
                        llinfos << " Writing " << filename << llendl;
-                        apr_file_t* file = ll_apr_file_open(filename, LL_APR_WB);
+                        
-                        ll_apr_file_write(file, buffer, size);
+                        LLAPRFile outfile ;
-                        apr_file_close(file);
+                        outfile.open(filename, LL_APR_WB);
+                        outfile.write(buffer, size);
+                        outfile.close();
                        delete[] buffer;
                        files_extracted++;
                }
diff --git a/linden/indra/llvfs/llvfs.h b/linden/indra/llvfs/llvfs.h
index b31ec89..a68c8f4 100644
--- a/linden/indra/llvfs/llvfs.h
+++ b/linden/indra/llvfs/llvfs.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/llvfsthread.cpp b/linden/indra/llvfs/llvfsthread.cpp
index 599c00e..69da4b7 100644
--- a/linden/indra/llvfs/llvfsthread.cpp
+++ b/linden/indra/llvfs/llvfsthread.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llvfs/llvfsthread.h b/linden/indra/llvfs/llvfsthread.h
index b38a788..0a9786e 100644
--- a/linden/indra/llvfs/llvfsthread.h
+++ b/linden/indra/llvfs/llvfsthread.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,