From 3fd18de4502c8713278d7a03229c8b48ca92a4af Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 7 Aug 2008 18:54:13 +0000 Subject: svn merge -r 93444:93885 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release Backport fixes from UPCOMING production branch: * Fixed gdb/simulator statistics bucket index: "bucket[1]" to "bucket[2]" * Updated eventlet and mulib external revisions * Various deploy script tweaks * DEV-17796 Sim performance decreases a lot with rezzing physical objects * DEV-18900 Turn off the LL_DEBUG_PUMPS code * DEV-18896 SVC-2738: Mono Beta: Newer LSL functions will not compile under Mono * DEV-18825 make install_indra.py produce the /local/www/login.GRID.lindenlab.com tree/symlinks * DEV-18826 make install_indra.py produce the /local/www/xmlrpc.*.com tree/symlinks * DEV-18188 View:Property Lines and View:Land Owners shows everything as group owned even if it's not under 1.23.2.92647 * DEV-18723 develop.py -t Release build server should build everything needed to succesfully farm stage a server * DEV-18316 Simulator crashing on exit due to bad use of global pointer caching --- indra/llcommon/llversionserver.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index b33979a8c5..fd5f6497c2 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -33,9 +33,9 @@ #define LL_LLVERSIONSERVER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 23; -const S32 LL_VERSION_PATCH = 4; -const S32 LL_VERSION_BUILD = 93096; +const S32 LL_VERSION_MINOR = 24; +const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_BUILD = 93453; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.3