Skip to content
Snippets Groups Projects
Commit f0f2a416 authored by Josh Bell's avatar Josh Bell
Browse files

svn merge -r 93027:93128...

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
parent b4ed6bb9
No related branches found
No related tags found
No related merge requests found
......@@ -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";
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment