diff options
| author | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
| commit | fbcbfb88059b0d669592407205dd4167257a2395 (patch) | |
| tree | 7855a06b2bf542262c1d50a602d67244d0df6b5e /indra/llvfs | |
| parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
| parent | 904776288c7f7ebd945e563567aafbcab387d0b2 (diff) | |
merge
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 8b1a2ddd3c..52d864e26f 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -116,10 +116,6 @@ LLDir_Win32::LLDir_Win32() mExecutableDir = utf16str_to_utf8str(llutf16string(w_str)); #endif - mAppRODataDir = "."; - - mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; - if (mExecutableDir.find("indra") == std::string::npos) { // Running from installed directory. Make sure current @@ -129,8 +125,12 @@ LLDir_Win32::LLDir_Win32() GetCurrentDirectory(MAX_PATH, w_str); mWorkingDir = utf16str_to_utf8str(llutf16string(w_str)); } + mAppRODataDir = mWorkingDir; + llinfos << "mAppRODataDir = " << mAppRODataDir << llendl; + mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; + // Build the default cache directory mDefaultCacheDir = buildSLOSCacheDir(); |