From f0f2a416911ba8de9ac1e08cd90720c0d789bb2e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 28 Jul 2008 20:35:24 +0000 Subject: 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 --- indra/llcommon/llversionserver.h | 4 ++-- indra/llmessage/llcurl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 370689b46b..b33979a8c5 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 23; -const S32 LL_VERSION_PATCH = 3; -const S32 LL_VERSION_BUILD = 92647; +const S32 LL_VERSION_PATCH = 4; +const S32 LL_VERSION_BUILD = 93096; const char * const LL_CHANNEL = "Second Life Server"; 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() -- cgit v1.2.3