diff options
author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/llvfs/lldir_win32.cpp | |
parent | Changed version to Experimental 2010.09.18 (diff) | |
download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz |
llmediaplugins first step
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llvfs/lldir_win32.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
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() | |||
143 | llwarns << "Couldn't create LL_PATH_CACHE dir " << mDefaultCacheDir << llendl; | 143 | llwarns << "Couldn't create LL_PATH_CACHE dir " << mDefaultCacheDir << llendl; |
144 | } | 144 | } |
145 | } | 145 | } |
146 | |||
147 | mLLPluginDir = mExecutableDir + mDirDelimiter + "llplugin"; | ||
146 | } | 148 | } |
147 | 149 | ||
148 | LLDir_Win32::~LLDir_Win32() | 150 | LLDir_Win32::~LLDir_Win32() |
@@ -378,6 +380,19 @@ BOOL LLDir_Win32::fileExists(const std::string &filename) const | |||
378 | } | 380 | } |
379 | 381 | ||
380 | 382 | ||
383 | /*virtual*/ std::string LLDir_Win32::getLLPluginLauncher() | ||
384 | { | ||
385 | return gDirUtilp->getExecutableDir() + gDirUtilp->getDirDelimiter() + | ||
386 | "SLPlugin.exe"; | ||
387 | } | ||
388 | |||
389 | /*virtual*/ std::string LLDir_Win32::getLLPluginFilename(std::string base_name) | ||
390 | { | ||
391 | return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() + | ||
392 | base_name + ".dll"; | ||
393 | } | ||
394 | |||
395 | |||
381 | #if 0 | 396 | #if 0 |
382 | // Utility function to get version number of a DLL | 397 | // Utility function to get version number of a DLL |
383 | 398 | ||