From 3a48310ee7f61a39cec40b7ae472393969887c2e Mon Sep 17 00:00:00 2001 From: Beeks Date: Sun, 26 Sep 2010 16:17:05 -0400 Subject: [PATCH] Fix for cache issues (May or may not be Mac-specific?) Added by Belaya. Signed-off-by: Beeks --- indra/llvfs/lldir.cpp | 2 +- indra/llvfs/lldir_mac.cpp | 4 ++-- indra/newview/llao.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 8f748d8ee..45055007a 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -247,7 +247,7 @@ std::string LLDir::buildSLOSCacheDir() const } else { - res = getOSCacheDir() + mDirDelimiter + "SecondLife"; + res = getOSCacheDir() + mDirDelimiter + "Ascent"; } return res; } diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 5895dd664..092bc6a7e 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -122,7 +122,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("SecondLife"); + CFStringRef secondLifeString = CFSTR("Ascent"); mainBundleRef = CFBundleGetMainBundle(); @@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("Ascent"), NULL); } // mOSUserAppDir diff --git a/indra/newview/llao.cpp b/indra/newview/llao.cpp index 01fb78e38..5dfc9d236 100644 --- a/indra/newview/llao.cpp +++ b/indra/newview/llao.cpp @@ -2,7 +2,6 @@ /* DOUBLE EDIT REACH AROUND Rewritten by Hg Beeks -We will handle drag-and-drop in the future. Reminder - Look in llPreviewGesture for handleDragAndDrop. -HgB */ #include "llviewerprecompiledheaders.h"