summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-07-28 20:35:24 +0000
committerJosh Bell <josh@lindenlab.com>2008-07-28 20:35:24 +0000
commitf0f2a416911ba8de9ac1e08cd90720c0d789bb2e (patch)
tree0c5442c50f0b2b84a9d59484216955de9145f1e3 /indra/llmessage
parentb4ed6bb95c28ea805c756373df0bd0cde7505eb8 (diff)
svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes from production branch * DEV-8282 integrated alt check with durls white list code * Fix for memory stomping due to deleting vector as scalars * DEV-16904 Email message shows incorrect owner when inventory item is sent to offline resident from scripted object inworld
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcurl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 5a426c7238..376b2ecc99 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -268,7 +268,7 @@ LLCurl::Easy::~Easy()
curl_easy_cleanup(mCurlEasyHandle);
--gCurlEasyCount;
curl_slist_free_all(mHeaders);
- for_each(mStrings.begin(), mStrings.end(), DeletePointer());
+ for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
}
void LLCurl::Easy::resetState()