From b807e3df990e6fad25cd0bca94d2959dac042b13 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Wed, 8 Oct 2008 00:22:32 +0000 Subject: merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real) --- indra/newview/llappviewer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.cpp') 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); -- cgit v1.3