diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-05-22 22:08:54 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-05-22 22:08:54 +0000 |
| commit | 060c728970dc78d30f2cebdbeda7e56ea8de46e2 (patch) | |
| tree | 8f00ce1b3bd564bc6cb81a2bc39a081eb3deca35 /indra/llvfs/lldir_mac.cpp | |
| parent | f8874d04b8ca238ee99dc464055295cff417a9b2 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge. Pull in viewer-release after release of 3.7.8
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
| -rwxr-xr-x | indra/llvfs/lldir_mac.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index e00596cdb5..4038c92465 100755 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -100,8 +100,8 @@ LLDir_Mac::LLDir_Mac() // ...we're in a dev checkout mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins"; - llinfos << "Running in dev checkout with mSkinBaseDir " - << mSkinBaseDir << llendl; + LL_INFOS() << "Running in dev checkout with mSkinBaseDir " + << mSkinBaseDir << LL_ENDL; } else { @@ -134,7 +134,7 @@ LLDir_Mac::LLDir_Mac() { mOSCacheDir = *cachedir; - //Aura TODO: This changes from ~/Library/Cache/Secondlife to ~/Library/Cache/com.app.secondlife/Secondlife. Last dir level could go away. + //TODO: This changes from ~/Library/Cache/Secondlife to ~/Library/Cache/com.app.secondlife/Secondlife. Last dir level could go away. CreateDirectory(mOSCacheDir, secondLifeString, NULL); } |