diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
| commit | 4296542cd062af425d7744c88d6dd2bd00daf532 (patch) | |
| tree | 8926d4f0bfaa9ed672f4cf90577afcf8e7f44a97 /indra/newview/llappviewer.cpp | |
| parent | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (diff) | |
Roll back of r98854 Accidentally commited merge in progress
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index aed88497ee..770fa0ad56 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1730,7 +1730,7 @@ bool LLAppViewer::initConfiguration() OSMessageBox( msg.str().c_str(), - LLStringUtil::null, + NULL, OSMB_OK); return false; @@ -2670,7 +2670,7 @@ bool LLAppViewer::initCache() std::string cache_dir = gDirUtilp->getOSUserAppDir(); std::string new_cache_dir = gDirUtilp->getOSCacheDir(); cache_dir = cache_dir + "/cache"; - new_cache_dir = new_cache_dir + "/SecondLife"; + new_cache_dir = new_cache_dir + "/" + gSecondLife; if (gDirUtilp->fileExists(cache_dir)) { gDirUtilp->setCacheDir(cache_dir); |