diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
| commit | b807e3df990e6fad25cd0bca94d2959dac042b13 (patch) | |
| tree | aa8b185cac406abe412d76d90a903b450191d84d /indra/newview/llappviewer.cpp | |
| parent | 4296542cd062af425d7744c88d6dd2bd00daf532 (diff) | |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
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 770fa0ad56..aed88497ee 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1730,7 +1730,7 @@ bool LLAppViewer::initConfiguration() OSMessageBox( msg.str().c_str(), - NULL, + LLStringUtil::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 + "/" + gSecondLife; + new_cache_dir = new_cache_dir + "/SecondLife"; if (gDirUtilp->fileExists(cache_dir)) { gDirUtilp->setCacheDir(cache_dir); |