diff options
author | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
---|---|---|
committer | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
commit | 8392fde6f6a4dfdb2a78382f3587ecd5a6d937ff (patch) | |
tree | 5c0b89998c072175cd1d1cb3c429a127af8f04d6 /indra/llplugin/llplugincookiestore.cpp | |
parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
parent | 51e0cc8140a2cbe92363cb902144ccc9bf34b7c7 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
Diffstat (limited to 'indra/llplugin/llplugincookiestore.cpp')
-rwxr-xr-x | indra/llplugin/llplugincookiestore.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llplugin/llplugincookiestore.cpp b/indra/llplugin/llplugincookiestore.cpp index f64b264222..a5d717389d 100755 --- a/indra/llplugin/llplugincookiestore.cpp +++ b/indra/llplugin/llplugincookiestore.cpp @@ -27,6 +27,7 @@ */ #include "linden_common.h" +#include "llstl.h" #include "indra_constants.h" #include "llplugincookiestore.h" @@ -654,12 +655,8 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t void LLPluginCookieStore::clearCookies() { - while(!mCookies.empty()) - { - cookie_map_t::iterator iter = mCookies.begin(); - delete iter->second; - mCookies.erase(iter); - } + std::for_each(mCookies.begin(), mCookies.end(), DeletePairedPointer()); + mCookies.clear(); } void LLPluginCookieStore::removeCookie(const std::string &key) |