diff options
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 14 | ||||
| -rw-r--r-- | indra/llvfs/tests/lldir_test.cpp | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 7a531e0fbf..08c993ed2a 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -99,7 +99,19 @@ LLDir_Linux::LLDir_Linux() #else mAppRODataDir = tmp_str; #endif - mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; + U32 indra_pos = mExecutableDir.find("/indra"); + if (indra_pos != std::string::npos) + { + // ...we're in a dev checkout + mSkinBaseDir = mExecutableDir.substr(0, indra_pos) + "/indra/newview/skins"; + llinfos << "Running in dev checkout with mSkinBaseDir " + << mSkinBaseDir << llendl; + } + else + { + // ...normal installation running + mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; + } mOSUserDir = getCurrentUserHome(tmp_str); mOSUserAppDir = ""; mLindenUserDir = tmp_str; diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp index a275e60882..9befa59477 100644 --- a/indra/llvfs/tests/lldir_test.cpp +++ b/indra/llvfs/tests/lldir_test.cpp @@ -1,5 +1,5 @@ /** - * @file lldir_tut.cpp + * @file lldir_test.cpp * @date 2008-05 * @brief LLDir test cases. * |