summaryrefslogtreecommitdiff
path: root/indra/llvfs/lldir_win32.cpp
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2008-12-02 20:35:40 +0000
committerAdam Moss <moss@lindenlab.com>2008-12-02 20:35:40 +0000
commitfd46865a502036b9e4414e7ec4950faf551b1f14 (patch)
tree634dbca07e829d3906ed555341118c361aa1bb14 /indra/llvfs/lldir_win32.cpp
parentde7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff)
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/llvfs/lldir_win32.cpp')
-rw-r--r--indra/llvfs/lldir_win32.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 6e124002bc..ae2cd36072 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -58,14 +58,18 @@ LLDir_Win32::LLDir_Win32()
mOSUserDir = utf16str_to_utf8str(llutf16string(w_str));
- // Local Settings\Application Data is where cache files should
- // go, they don't get copied to the server if the user moves his
- // profile around on the network. JC
+ // We want cache files to go on the local disk, even if the
+ // user is on a network with a "roaming profile".
//
- // TODO: patch the installer to remove old cache files on update, then
- // enable this code.
- //SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
- //mOSUserCacheDir = utf16str_to_utf8str(llutf16string(w_str));
+ // On XP this is:
+ // C:\Docments and Settings\James\Local Settings\Application Data
+ // On Vista this is:
+ // C:\Users\James\AppData\Local
+ //
+ // We used to store the cache in AppData\Roaming, and the installer
+ // cleans up that version on upgrade. JC
+ SHGetSpecialFolderPath(NULL, w_str, CSIDL_LOCAL_APPDATA, TRUE);
+ mOSCacheDir = utf16str_to_utf8str(llutf16string(w_str));
if (GetTempPath(MAX_PATH, w_str))
{