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_linux.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
index 2d724f0f9f..d7a0dc8528 100644
--- a/indra/llvfs/lldir_linux.cpp
+++ b/indra/llvfs/lldir_linux.cpp
@@ -99,6 +99,7 @@ LLDir_Linux::LLDir_Linux()
 #else
 	mAppRODataDir = tmp_str;
 #endif
+	mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
 	mOSUserDir = getCurrentUserHome(tmp_str);
 	mOSUserAppDir = "";
 	mLindenUserDir = tmp_str;
@@ -146,6 +147,7 @@ void LLDir_Linux::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;
 
-- 
cgit v1.2.3