From 09d9b0556e8cf6c0a716e5b2c78b265799486331 Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Wed, 15 Jul 2009 23:16:09 +0000
Subject: 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.
---
 indra/llvfs/lldir_win32.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llvfs/lldir_win32.cpp')

diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 1fdd31c635..da80a95922 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -130,6 +130,7 @@ LLDir_Win32::LLDir_Win32()
 	else
 		mAppRODataDir = mExecutableDir;
 
+	mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
 
 	// Build the default cache directory
 	mDefaultCacheDir = buildSLOSCacheDir();
@@ -158,6 +159,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name,
 	if (!app_read_only_data_dir.empty())
 	{
 		mAppRODataDir = app_read_only_data_dir;
+		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
 	}
 	mAppName = app_name;
 	mOSUserAppDir = mOSUserDir;
-- 
cgit v1.2.3