From da94c0eaa2ce2711f0ae26968e87ef3e409126a9 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 12 Sep 2008 06:27:13 +0000 Subject: QAR-855 Viewer 1.21 RC 2 merge viewer_1-21 94770-96059 -> release --- indra/llvfs/lldir_win32.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/llvfs/lldir_win32.cpp') diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index d21babec24..6e124002bc 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -117,15 +117,13 @@ LLDir_Win32::LLDir_Win32() mExecutableDir = utf16str_to_utf8str(llutf16string(w_str)); #endif - mAppRODataDir = getCurPath(); - // *FIX:Mani - The following is the old way we did things. I'm keeping this around - // in case there is some really good reason to make mAppRODataDir == mExecutableDir - /* - if (strstr(mExecutableDir.c_str(), "indra\\newview")) + // When running in a dev tree, app_settings is under indra/newview/ + // but in production it is under Program Files/SecondLife/ + // Attempt to detect which one we're using. JC + if (mExecutableDir.find("indra") != std::string::npos) mAppRODataDir = getCurPath(); else mAppRODataDir = mExecutableDir; - */ } LLDir_Win32::~LLDir_Win32() -- cgit v1.2.3