svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04

Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac.

Reviewed by James.

1 files changed, 12 insertions, 7 deletions

diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index f53c62580f..7f703464bc 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -142,24 +142,28 @@ LLDir_Mac::LLDir_Mac()
 		CFURLRefToLLString(executableParentURLRef, mExecutableDir, true);
 		
 		// mAppRODataDir
-		// *NOTE: When running in a dev tree, use the copy of app_settings and
+
+		CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
+		CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+		
+		// *NOTE: When running in a dev tree, use the copy of
 		// skins in indra/newview/ rather than in the application bundle.  This
 		// mirrors Windows dev environment behavior and allows direct checkin
 		// of edited skins/xui files. JC
+
 		U32 indra_pos = mExecutableDir.find("/indra");
 		if (indra_pos != std::string::npos)
 		{
 			// ...we're in a dev checkout
-			mAppRODataDir = mExecutableDir.substr(0, indra_pos)
-				+ "/indra/newview";
-			llinfos << "Running in dev checkout with mAppRODataDir "
-				<< mAppRODataDir << llendl;
+			mSkinBaseDir = mExecutableDir.substr(0, indra_pos)
+				+ "/indra/newview/skins";
+			llinfos << "Running in dev checkout with mSkinBaseDir "
+				<< mSkinBaseDir << llendl;
 		}
 		else
 		{
 			// ...normal installation running
-			CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
-			CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+			mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
 		}
 		
 		// mOSUserDir
@@ -227,6 +231,7 @@ void LLDir_Mac::initAppDirs(const std::string &app_name,
 	if (!app_read_only_data_dir.empty())
 	{
 		mAppRODataDir = app_read_only_data_dir;
+		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
 	}
 	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");