diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
| commit | eca30a22626b9a3e68e0e55f8da75614cd60d713 (patch) | |
| tree | d27f30f138553c1f0fbc0e61ef0d2ae036d54662 /indra/llvfs | |
| parent | bc4444cd78067cbf11d3ffb210375a31a33f96bd (diff) | |
| parent | 3f05d552fec9d4d9a17c9131f445a7db0eef561f (diff) | |
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 24efcb8ae8..7a531e0fbf 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -383,7 +383,7 @@ BOOL LLDir_Linux::fileExists(const std::string &filename) const /*virtual*/ std::string LLDir_Linux::getLLPluginLauncher() { - return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() + + return gDirUtilp->getExecutableDir() + gDirUtilp->getDirDelimiter() + "SLPlugin"; } diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 9be787df11..346f7dd8ed 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -424,7 +424,7 @@ BOOL LLDir_Mac::fileExists(const std::string &filename) const /*virtual*/ std::string LLDir_Mac::getLLPluginLauncher() { - return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() + + return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() + "SLPlugin"; } diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 872f2cf1c1..3e302764de 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -397,7 +397,7 @@ BOOL LLDir_Win32::fileExists(const std::string &filename) const /*virtual*/ std::string LLDir_Win32::getLLPluginLauncher() { - return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() + + return gDirUtilp->getExecutableDir() + gDirUtilp->getDirDelimiter() + "SLPlugin.exe"; } |