diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-03-26 18:21:10 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-03-26 18:21:10 -0700 |
commit | cb7ea3f354f8305471e40090fff96e868517b60e (patch) | |
tree | 477f14c1c1fe353708e5c6560a57970039a0b5a5 | |
parent | 8a3fe4d9e4dd5e3092bf55664c0435315690d1f0 (diff) |
Fix "clear cookies" not clearing cookies in some cases
LLViewerMedia::clearAllCookies was sending "clear cookies" messages to all plugins and deleting cookie files, but it wasn't clearing the cookies in the central store. It now does all of the above.
-rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index ab55fcff6e..61a75f7227 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1008,6 +1008,9 @@ void LLViewerMedia::clearAllCookies() } } + // Clear all cookies from the cookie store + getCookieStore()->setAllCookies(""); + // FIXME: this may not be sufficient, since the on-disk cookie file won't get written until some browser instance exits cleanly. // It also won't clear cookies for other accounts, or for any account if we're not logged in, and won't do anything at all if there are no webkit plugins loaded. // Until such time as we can centralize cookie storage, the following hack should cover these cases: @@ -1051,7 +1054,8 @@ void LLViewerMedia::clearAllCookies() { LLFile::remove(target); } - + + // Other accounts may have new-style cookie files too -- delete them as well target = base_dir; target += filename; target += gDirUtilp->getDirDelimiter(); |