10 files changed, 97 insertions, 9 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 2c3c5f7..b8a4794 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -192,8 +192,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;
 }
 
@@ -294,6 +295,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 +470,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 b2d9787..29cac58 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -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";
+}
+
+/*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..9d4c5ec 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -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);