diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-25 00:15:56 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-25 00:15:56 +0000 |
| commit | 75b2af6df8d0980470d5e5a576280af598a988fc (patch) | |
| tree | 194735b3b26b27d67f46b851551959506d0d8107 | |
| parent | 108b20b800fad1e9d8490ed18605c4257fdaf19c (diff) | |
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?
| -rw-r--r-- | indra/llcommon/llstl.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h index 988e706091..99fc83274b 100644 --- a/indra/llcommon/llstl.h +++ b/indra/llcommon/llstl.h @@ -105,6 +105,7 @@ struct DeletePairedPointer template<typename T> void operator()(T &ptr) const { delete ptr.second; + ptr.second = NULL; } }; struct DeletePairedPointerArray @@ -112,6 +113,7 @@ struct DeletePairedPointerArray template<typename T> void operator()(T &ptr) const { delete[] ptr.second; + ptr.second = NULL; } }; diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 5fbf6582da..370689b46b 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 = 2; -const S32 LL_VERSION_BUILD = 92378; +const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_BUILD = 92647; const char * const LL_CHANNEL = "Second Life Server"; |