diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-07-15 23:16:09 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-07-15 23:16:09 +0000 |
| commit | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (patch) | |
| tree | 24804ab9dd0528f67acf1b7fd0457f1a3c6f6b5f /indra/llvfs/lldir_win32.cpp | |
| parent | 408bed3d6b01d654d460b9ee0d929370194d8f9a (diff) | |
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.
Diffstat (limited to 'indra/llvfs/lldir_win32.cpp')
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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; |