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

svn merge -r 92383:92992...

svn merge -r 92383:92992 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release

Backport fixes and other cruft from the production branch:
* DEV-16158 make_deploy_group.py queries simulator_standby table not region conductor
* DEV-17891 SEC-118: Classifieds can be created with any amount paid for L$50
* QAR-745 Test rez object security break - SEC-104 (and possibly SEC-115)
* DEV-18161 allow_negative_balance parameter for sink operation so fraud team can dock the accounts of people who bought bad L$
* DEV-18217 Crash rate >10x higher in 1.23.2 than 1.22.4
* DEV-15570 Enable Improved IM web service
* add auth.py from interop-5 (for interop login testing on preview grid)

did-you-know-that-dataserver-is-deprecated?
parent 108b20b8
No related branches found
No related tags found
No related merge requests found
...@@ -105,6 +105,7 @@ struct DeletePairedPointer ...@@ -105,6 +105,7 @@ struct DeletePairedPointer
template<typename T> void operator()(T &ptr) const template<typename T> void operator()(T &ptr) const
{ {
delete ptr.second; delete ptr.second;
ptr.second = NULL;
} }
}; };
struct DeletePairedPointerArray struct DeletePairedPointerArray
...@@ -112,6 +113,7 @@ struct DeletePairedPointerArray ...@@ -112,6 +113,7 @@ struct DeletePairedPointerArray
template<typename T> void operator()(T &ptr) const template<typename T> void operator()(T &ptr) const
{ {
delete[] ptr.second; delete[] ptr.second;
ptr.second = NULL;
} }
}; };
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 23; const S32 LL_VERSION_MINOR = 23;
const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 92378; const S32 LL_VERSION_BUILD = 92647;
const char * const LL_CHANNEL = "Second Life Server"; const char * const LL_CHANNEL = "Second Life Server";
......
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