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/llviewermedia.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 'linden/indra/newview/llviewermedia.cpp')
-rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index 57c2111..5c01b25 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp | |||
@@ -471,7 +471,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ | |||
471 | // at the login page displaying login Web page or Web browser test via Develop menu. | 471 | // at the login page displaying login Web page or Web browser test via Develop menu. |
472 | // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this | 472 | // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this |
473 | // is what we always used before this change) | 473 | // is what we always used before this change) |
474 | std::string linden_user_dir = gDirUtilp->getLindenUserDir(); | 474 | std::string linden_user_dir = gDirUtilp->getLindenUserDir(true); |
475 | if ( ! linden_user_dir.empty() ) | 475 | if ( ! linden_user_dir.empty() ) |
476 | { | 476 | { |
477 | // gDirUtilp->getLindenUserDir() is whole path, not just Linden name | 477 | // gDirUtilp->getLindenUserDir() is whole path, not just Linden name |