summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp4
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);