livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2008-07-28 20:35:24 +00:00
parent b4ed6bb95c
commit f0f2a41691
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llversionserver.h
View File

@ -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";

2
indra/llmessage/llcurl.cpp
View File

@ -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()