summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2008-10-07 20:50:30 +0000
committerKyle Ambroff <ambroff@lindenlab.com>2008-10-07 20:50:30 +0000
commit095aca3eaea4cbc2237d2b3ad3d63fdad54eb2b7 (patch)
treef003fd9ce7bc682e3114150cf17e273ceca589bd /indra/llcommon
parentb069bb9e71d31495f3f1312529d19fdb83c1779e (diff)
svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging various security fixes from Branch_1-24-Server. Related to RequestXfer exploit: * DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id. * DEV-21767: Migrate RequestXfer to TCP-only * DEV-21765: Fix RequestXfer traversal exploit * DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities Various fixes: * fix for VFS memory corruption in llvfs. * Bump server version to 1.24.9. Landstore fixes: * Passing locale to fulfill-order-item from region reservation fulfillment.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionserver.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index de2cbde0e1..425df83c40 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 = 24;
-const S32 LL_VERSION_PATCH = 7;
-const S32 LL_VERSION_BUILD = 97877;
+const S32 LL_VERSION_PATCH = 9;
+const S32 LL_VERSION_BUILD = 98650;
const char * const LL_CHANNEL = "Second Life Server";