14 files changed, 111 insertions, 18 deletions

diff --git a/linden/indra/llvfs/CMakeLists.txt b/linden/indra/llvfs/CMakeLists.txt
index cc0297e..25b57e0 100644
--- a/linden/indra/llvfs/CMakeLists.txt
+++ b/linden/indra/llvfs/CMakeLists.txt
@@ -4,7 +4,6 @@ project(llvfs)
 
 include(00-Common)
 include(LLCommon)
-include(UnixInstall)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index af55593..0c93cbb 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -43,6 +43,7 @@
 #include "lldir.h"
 #include "llerror.h"
 #include "lluuid.h"
+#include "lltimer.h"
 
 #if LL_WINDOWS
 #include "lldir_win32.h"
@@ -192,8 +193,9 @@ const std::string &LLDir::getOSUserAppDir() const
         return mOSUserAppDir;
 }
 
-const std::string &LLDir::getLindenUserDir() const
+const std::string &LLDir::getLindenUserDir(bool empty_ok) const
 {
+        llassert(empty_ok || !mLindenUserDir.empty());
         return mLindenUserDir;
 }
 
@@ -247,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "Imprudence";
+                res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental";
         }
         return res;
 }
@@ -294,6 +296,10 @@ const std::string LLDir::getSkinBaseDir() const
         return dir;
 }
 
+const std::string &LLDir::getLLPluginDir() const
+{
+        return mLLPluginDir;
+}
 
 std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const
 {
@@ -465,6 +471,8 @@ std::string LLDir::getDirName(const std::string& filepath) const
 
 std::string LLDir::getExtension(const std::string& filepath) const
 {
+        if (filepath.empty())
+                return std::string();
         std::string basename = getBaseFileName(filepath, false);
         std::size_t offset = basename.find_last_of('.');
         std::string exten = (offset == std::string::npos || offset == 0) ? "" : basename.substr(offset+1);
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 21dcf5b..766f351 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -80,6 +80,10 @@ class LLDir
         virtual BOOL fileExists(const std::string &filename) const = 0;
 
         const std::string findFile(const std::string &filename, const std::string searchPath1 = "", const std::string searchPath2 = "", const std::string searchPath3 = "") const;
+
+        virtual std::string getLLPluginLauncher() = 0; // full path and name for the plugin shell
+        virtual std::string getLLPluginFilename(std::string base_name) = 0; // full path and name to the plugin DSO for this base_name (i.e. 'FOO' -> '/bar/baz/libFOO.so')
+
         const std::string &getExecutablePathAndName() const;    // Full pathname of the executable
         const std::string &getAppName() const;                  // install directory under progams/ ie "SecondLife"
         const std::string &getExecutableDir() const;    // Directory where the executable is located
@@ -88,7 +92,7 @@ class LLDir
         const std::string &getAppRODataDir() const;     // Location of read-only data files
         const std::string &getOSUserDir() const;                // Location of the os-specific user dir
         const std::string &getOSUserAppDir() const;     // Location of the os-specific user app dir
-        const std::string &getLindenUserDir() const;    // Location of the Linden user dir.
+        const std::string &getLindenUserDir(bool empty_ok = false) const;       // Location of the Linden user dir.
         const std::string &getChatLogsDir() const;      // Location of the chat logs dir.
         const std::string &getPerAccountChatLogsDir() const;    // Location of the per account chat logs dir.
         const std::string &getTempDir() const;                  // Common temporary directory
@@ -100,6 +104,7 @@ class LLDir
         const std::string &getUserSkinDir() const;              // User-specified skin folder with user modifications. e.g. c:\documents and settings\username\application data\second life\skins\curskin
         const std::string &getDefaultSkinDir() const;   // folder for default skin. e.g. c:\program files\second life\skins\default
         const std::string getSkinBaseDir() const;               // folder that contains all installed skins (not user modifications). e.g. c:\program files\second life\skins
+        const std::string &getLLPluginDir() const;              // Directory containing plugins and plugin shell
 
         // Expanded filename
         std::string getExpandedFilename(ELLPath location, const std::string &filename) const;
@@ -156,6 +161,7 @@ protected:
         std::string mSkinDir;                   // Location for current skin info.
         std::string mDefaultSkinDir;                    // Location for default skin info.
         std::string mUserSkinDir;                       // Location for user-modified skin info.
+        std::string mLLPluginDir;                       // Location for plugins and plugin shell
 };
 
 void dir_exists_or_crash(const std::string &dir_name);
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 8ff8c5d..5f1eabb 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -94,14 +94,10 @@ LLDir_Linux::LLDir_Linux()
         mExecutablePathAndName = "";
         mExecutableDir = tmp_str;
         mWorkingDir = tmp_str;
-#ifdef APP_RO_DATA_DIR
-        mAppRODataDir = APP_RO_DATA_DIR;
-#else
         mAppRODataDir = tmp_str;
-#endif
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = tmp_str;
+        mLindenUserDir = "";
 
         char path [32]; /* Flawfinder: ignore */ 
 
@@ -128,6 +124,33 @@ LLDir_Linux::LLDir_Linux()
                 }
         }
 
+        mLLPluginDir = mExecutableDir + mDirDelimiter + "llplugin";
+
+#ifdef APP_RO_DATA_DIR
+        const char* appRODataDir = APP_RO_DATA_DIR;
+        if(appRODataDir[0] == '/')
+          {
+          // We have a full path to the data directory.
+          mAppRODataDir = appRODataDir;
+          }
+        else if(appRODataDir[0] != '\0')
+          {
+          // We have a relative path to the data directory.  Search
+          // for it in each potential install prefix containing the
+          // executable.
+          for(std::string prefix = getDirName(mExecutableDir);
+              !prefix.empty(); prefix = getDirName(prefix))
+            {
+            std::string dir = prefix + "/" + appRODataDir;
+            if(fileExists(dir + "/app_settings"))
+              {
+              mAppRODataDir = dir;
+              break;
+              }
+            }
+          }
+#endif
+
         // *TODO: don't use /tmp, use $HOME/.secondlife/tmp or something.
         mTempDir = "/tmp";
 }
@@ -370,3 +393,15 @@ BOOL LLDir_Linux::fileExists(const std::string &filename) const
         }
 }
 
+
+/*virtual*/ std::string LLDir_Linux::getLLPluginLauncher()
+{
+        return gDirUtilp->getExecutableDir() + gDirUtilp->getDirDelimiter() +
+                "SLPlugin";
+}
+
+/*virtual*/ std::string LLDir_Linux::getLLPluginFilename(std::string base_name)
+{
+        return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() +
+                "lib" + base_name + ".so";
+}
diff --git a/linden/indra/llvfs/lldir_linux.h b/linden/indra/llvfs/lldir_linux.h
index 20b408f..8e94fb1 100644
--- a/linden/indra/llvfs/lldir_linux.h
+++ b/linden/indra/llvfs/lldir_linux.h
@@ -52,6 +52,9 @@ public:
         virtual void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
         /*virtual*/ BOOL fileExists(const std::string &filename) const;
 
+        /*virtual*/ std::string getLLPluginLauncher();
+        /*virtual*/ std::string getLLPluginFilename(std::string base_name);
+
 private:
         DIR *mDirp;
         int mCurrentDirIndex;
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 6d5dcf3..6f0b037 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL);
                 }
                 
                 // mOSUserAppDir
@@ -190,6 +190,8 @@ LLDir_Mac::LLDir_Mac()
                 }
                 
                 mWorkingDir = getCurPath();
+
+                mLLPluginDir = mAppRODataDir + mDirDelimiter + "llplugin";
                                 
                 CFRelease(executableURLRef);
                 executableURLRef = NULL;
@@ -388,4 +390,17 @@ BOOL LLDir_Mac::fileExists(const std::string &filename) const
 }
 
 
+/*virtual*/ std::string LLDir_Mac::getLLPluginLauncher()
+{
+        return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() +
+                "SLPlugin.app/Contents/MacOS/SLPlugin";
+}
+
+/*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name)
+{
+        return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() +
+                base_name + ".dylib";
+}
+
+
 #endif // LL_DARWIN
diff --git a/linden/indra/llvfs/lldir_mac.h b/linden/indra/llvfs/lldir_mac.h
index 28d48a0..8be5d03 100644
--- a/linden/indra/llvfs/lldir_mac.h
+++ b/linden/indra/llvfs/lldir_mac.h
@@ -52,6 +52,9 @@ public:
         virtual void getRandomFileInDir(const std::string &dirname, const std::string &ask, std::string &fname);
         virtual BOOL fileExists(const std::string &filename) const;
 
+        /*virtual*/ std::string getLLPluginLauncher();
+        /*virtual*/ std::string getLLPluginFilename(std::string base_name);
+
 private:
         int mCurrentDirIndex;
         int mCurrentDirCount;
diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index 9553d92..5132455 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -100,7 +100,7 @@ LLDir_Solaris::LLDir_Solaris()
         mAppRODataDir = strdup(tmp_str);
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = tmp_str;
+        mLindenUserDir = "";
 
         char path [LL_MAX_PATH];        /* Flawfinder: ignore */ 
 
@@ -161,6 +161,8 @@ LLDir_Solaris::LLDir_Solaris()
                 }
         }
         
+        mLLPluginDir = mExecutableDir + mDirDelimiter + "llplugin";
+
         // *TODO: don't use /tmp, use $HOME/.secondlife/tmp or something.
         mTempDir = "/tmp";
 }
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 19b9bcc..e5d6747 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -112,7 +112,7 @@ LLDir_Win32::LLDir_Win32()
         }
         else
         {
-                fprintf(stderr, "Couldn't get APP path, assuming current directory!");
+                LL_WARNS("AppInit") << "Couldn't get APP path, assuming current directory!\n" << LL_ENDL;
                 GetCurrentDirectory(MAX_PATH, w_str);
                 mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
                 // Assume it's the current directory
@@ -143,6 +143,8 @@ LLDir_Win32::LLDir_Win32()
                         llwarns << "Couldn't create LL_PATH_CACHE dir " << mDefaultCacheDir << llendl;
                 }
         }
+
+        mLLPluginDir = mExecutableDir + mDirDelimiter + "llplugin";
 }
 
 LLDir_Win32::~LLDir_Win32()
@@ -378,6 +380,19 @@ BOOL LLDir_Win32::fileExists(const std::string &filename) const
 }
 
 
+/*virtual*/ std::string LLDir_Win32::getLLPluginLauncher()
+{
+        return gDirUtilp->getExecutableDir() + gDirUtilp->getDirDelimiter() +
+                "SLPlugin.exe";
+}
+
+/*virtual*/ std::string LLDir_Win32::getLLPluginFilename(std::string base_name)
+{
+        return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() +
+                base_name + ".dll";
+}
+
+
 #if 0
 // Utility function to get version number of a DLL
 
diff --git a/linden/indra/llvfs/lldir_win32.h b/linden/indra/llvfs/lldir_win32.h
index 8710ca5..9ef4d30 100644
--- a/linden/indra/llvfs/lldir_win32.h
+++ b/linden/indra/llvfs/lldir_win32.h
@@ -49,6 +49,9 @@ public:
         /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
         /*virtual*/ BOOL fileExists(const std::string &filename) const;
 
+        /*virtual*/ std::string getLLPluginLauncher();
+        /*virtual*/ std::string getLLPluginFilename(std::string base_name);
+
 private:
         BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
         
diff --git a/linden/indra/llvfs/llpidlock.cpp b/linden/indra/llvfs/llpidlock.cpp
index 93ac120..cb64428 100755
--- a/linden/indra/llvfs/llpidlock.cpp
+++ b/linden/indra/llvfs/llpidlock.cpp
@@ -39,6 +39,7 @@
 #include "llsdserialize.h"
 #include "llnametable.h"
 #include "llframetimer.h"
+#include "llapp.h"
 
 #if LL_WINDOWS   //For windows platform.
 bool isProcessAlive(U32 pid)
@@ -60,7 +61,7 @@ class LLPidLockFile
         public:
                 LLPidLockFile( ) :
                         mSaving(FALSE), mWaiting(FALSE), 
-                        mClean(TRUE), mPID(getpid())
+                        mClean(TRUE), mPID(LLApp::getPid())
                 {
                         mLockName = gDirUtilp->getTempDir() + "/savelock";
                 }
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h
index 42aee4d..6103599 100755
--- a/linden/indra/llvfs/llpidlock.h
+++ b/linden/indra/llvfs/llpidlock.h
@@ -39,10 +39,10 @@ class LLFrameTimer;
 
 #if LL_WINDOWS  //For windows platform.
 
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 
-#define getpid GetCurrentProcessId
-
 #else   //Everyone Else
 
 #include <signal.h>
diff --git a/linden/indra/llvfs/llvfile.cpp b/linden/indra/llvfs/llvfile.cpp
index 6b1563b..630975a 100644
--- a/linden/indra/llvfs/llvfile.cpp
+++ b/linden/indra/llvfs/llvfile.cpp
@@ -38,6 +38,7 @@
 #include "llthread.h"
 #include "llstat.h"
 #include "llvfs.h"
+#include "llfasttimer.h"
 
 const S32 LLVFile::READ                 = 0x00000001;
 const S32 LLVFile::WRITE                = 0x00000002;
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index 7df2a81..654dfa1 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -47,6 +47,7 @@
     
 #include "llvfs.h"
 #include "llstl.h"
+#include "lltimer.h"
     
 const S32 FILE_BLOCK_MASK = 0x000003FF;  // 1024-byte blocks
 const S32 VFS_CLEANUP_SIZE = 5242880;  // how much space we free up in a single stroke
@@ -236,7 +237,7 @@ 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)
 {
-        mDataMutex = new LLMutex(0);
+        mDataMutex = new LLMutex;
 
         S32 i;
         for (i = 0; i < VFSLOCK_COUNT; i++)
@@ -583,8 +584,9 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
                 }
         }
 
-        LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
-        LL_WARNS("VFS") << "Using data file " << mDataFilename << LL_ENDL;
+        // Success!
+        LL_INFOS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
+        LL_INFOS("VFS") << "Using data file " << mDataFilename << LL_ENDL;
 
         mValid = VFSVALID_OK;
 }