diff options
author | Aleric Inglewood | 2010-10-20 18:31:42 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-20 18:31:42 +0200 |
commit | 2f4e17af336c9a399a0274b7836f40fc7ff56e21 (patch) | |
tree | 1c5c9d83bab4a602b58b439ffccd758ebca54836 /linden/indra/newview/llmutelist.cpp | |
parent | Update WebKit Version in About floater. (diff) | |
download | meta-impy-2f4e17af336c9a399a0274b7836f40fc7ff56e21.zip meta-impy-2f4e17af336c9a399a0274b7836f40fc7ff56e21.tar.gz meta-impy-2f4e17af336c9a399a0274b7836f40fc7ff56e21.tar.bz2 meta-impy-2f4e17af336c9a399a0274b7836f40fc7ff56e21.tar.xz |
LindenUserDir fixes.
The LindenUserDir (~/.imprudence/first_last/) cannot be initialized
before the user logged in. However, several singletons (that only can be
initialized once) depend on this directory for initialization. Therefore
we have to take care not to instantiate those singletons until after the
user logged in.
With regard to webit, this fixes the browser_profile (cache and cookies)
directory that the builtin browser uses.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llmutelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp index 0e03509..fff5558 100644 --- a/linden/indra/newview/llmutelist.cpp +++ b/linden/indra/newview/llmutelist.cpp | |||
@@ -265,7 +265,7 @@ LLMuteList::~LLMuteList() | |||
265 | // If we quit from the login screen we will not have an SL account | 265 | // If we quit from the login screen we will not have an SL account |
266 | // name. Don't try to save, otherwise we'll dump a file in | 266 | // name. Don't try to save, otherwise we'll dump a file in |
267 | // C:\Program Files\SecondLife\ JC | 267 | // C:\Program Files\SecondLife\ JC |
268 | std::string user_dir = gDirUtilp->getLindenUserDir(); | 268 | std::string user_dir = gDirUtilp->getLindenUserDir(true); |
269 | if (!user_dir.empty()) | 269 | if (!user_dir.empty()) |
270 | { | 270 | { |
271 | std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml"); | 271 | std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml"); |