diff -r 9c0506d10226 doc/contributions.txt
--- a/doc/contributions.txt	Mon Apr 18 09:19:05 2011 -0400
+++ b/doc/contributions.txt	Tue Apr 26 01:26:31 2011 +0200
@@ -204,6 +204,7 @@
 	SNOW-624
 	SNOW-737
 	STORM-318
+	STORM-1182
 	VWR-233
 	VWR-20583
 	VWR-20891
diff -r 9c0506d10226 indra/llvfs/lldir_linux.cpp
--- a/indra/llvfs/lldir_linux.cpp	Mon Apr 18 09:19:05 2011 -0400
+++ b/indra/llvfs/lldir_linux.cpp	Tue Apr 26 01:26:31 2011 +0200
@@ -93,11 +93,11 @@
 #else
 	mAppRODataDir = tmp_str;
 #endif
-    std::string::size_type indra_pos = mExecutableDir.find("/indra");
-    if (indra_pos != std::string::npos)
+    std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-linux-");
+    if (build_dir_pos != std::string::npos)
     {
 		// ...we're in a dev checkout
-		mSkinBaseDir = mExecutableDir.substr(0, indra_pos) + "/indra/newview/skins";
+		mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins";
 		llinfos << "Running in dev checkout with mSkinBaseDir "
 		 << mSkinBaseDir << llendl;
     }
diff -r 9c0506d10226 indra/llvfs/lldir_mac.cpp
--- a/indra/llvfs/lldir_mac.cpp	Mon Apr 18 09:19:05 2011 -0400
+++ b/indra/llvfs/lldir_mac.cpp	Tue Apr 26 01:26:31 2011 +0200
@@ -150,11 +150,11 @@
 		CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
 		CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
 		
-		U32 indra_pos = mExecutableDir.find("/indra");
-		if (indra_pos != std::string::npos)
+		U32 build_dir_pos = mExecutableDir.rfind("/build-darwin-");
+		if (build_dir_pos != std::string::npos)
 		{
 			// ...we're in a dev checkout
-			mSkinBaseDir = mExecutableDir.substr(0, indra_pos)
+			mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos)
 				+ "/indra/newview/skins";
 			llinfos << "Running in dev checkout with mSkinBaseDir "
 				<< mSkinBaseDir << llendl;