merge changes for 3.7.2-release

1 files changed, 28 insertions, 0 deletions

diff --git a/indra/llplugin/llplugincookiestore.cpp b/indra/llplugin/llplugincookiestore.cpp
index 82017ab3fa..9f4d65e723 100755
--- a/indra/llplugin/llplugincookiestore.cpp
+++ b/indra/llplugin/llplugincookiestore.cpp
@@ -87,6 +87,16 @@ std::string LLPluginCookieStore::Cookie::getKey() const
 	return result;
 }
 
+std::string LLPluginCookieStore::Cookie::getDomain() const
+{
+	std::string result;
+	if(mDomainEnd > mDomainStart)
+	{
+		result += mCookie.substr(mDomainStart, mDomainEnd - mDomainStart);
+	}
+	return result;
+}
+
 bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 {
 	bool first_field = true;
@@ -662,3 +672,21 @@ void LLPluginCookieStore::removeCookie(const std::string &key)
 	}
 }
 
+void LLPluginCookieStore::removeCookiesByDomain(const std::string &domain)
+{
+	cookie_map_t::iterator iter = mCookies.begin();
+	while(iter != mCookies.end())
+	{ 
+		if(iter->second->getDomain() == domain)
+		{
+            cookie_map_t::iterator doErase = iter;
+            iter++;
+			delete doErase->second;
+			mCookies.erase(doErase);
+		}
+        else
+        {
+            iter++;
+        }
+	}
+}