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.h | |
| 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.h')
| -rw-r--r-- | indra/llvfs/lldir.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index a33f7a2914..a1f9df007d 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -161,6 +161,7 @@ protected: std::string mDefaultCacheDir; // default cache diretory std::string mOSCacheDir; // operating system cache dir std::string mDirDelimiter; + std::string mSkinBaseDir; // Base for skins paths. std::string mSkinDir; // Location for current skin info. std::string mDefaultSkinDir; // Location for default skin info. std::string mUserSkinDir; // Location for user-modified skin info. |