From 292627c09df6085c985a189edd5df06d3ca1eb47 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 17 Jul 2008 22:30:12 +0000 Subject: svn merge -r 91176:92383 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server Backport fixes from the 1.23 Server branch * DEV-17223 remove the words slot and bets from dataserver.xml * DEV-17351 Unable to set estate manager * DEV-17138 users with god mode capabilities not able to join groups * DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead * DEV-17863 Memory Leak in 1.23 (related to returning objects?) * DEV-17804 CSR tool showing old data on Summary page * DEV-17811 Ban list showing (???) (???) for names dataserver-is-deprecated --- indra/llcommon/llversionserver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index af76f528e8..5fbf6582da 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 = 0; -const S32 LL_VERSION_BUILD = 87048; +const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_BUILD = 92378; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3