summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-14 20:10:44 -0700
committerRichard Linden <none@none>2010-09-14 20:10:44 -0700
commit83e0ee0f3fa57ba0eb3cd69b334aec6554c1fdf6 (patch)
tree3060e37a0a6a792f271e079d60a5de3fa79f4d41
parent3918b251e0f0405042ac8af6f5ff808bc2cc9553 (diff)
fixed full path not appearing in debug output for param block errors by using full path for LLDir::mAppRODataDir
-rw-r--r--indra/llvfs/lldir_win32.cpp8
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();