2 files changed, 6 insertions, 7 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 325a2a39b6..ff7bfde521 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -377,7 +377,8 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
 
 	case LL_PATH_EXECUTABLE:
 		prefix = getExecutableDir();
-		
+		break;
+
 	default:
 		llassert(0);
 	}
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()