diff options
| author | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
| commit | 58ac85223e976556b060ca0ff345f1a96d8f7848 (patch) | |
| tree | 1e8901e1a47304829d67e5e71b178a5f47142c7c /indra/llvfs | |
| parent | 92195c479f597538a55dfa8b2e02c1b4908a2259 (diff) | |
| parent | fbcbfb88059b0d669592407205dd4167257a2395 (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(); |