From b6e2a894f524b4dab1f3bb80572920fe926ed4c2 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 3 Jan 2008 19:53:12 +0000 Subject: svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release Pick up patches for: * DEV-7727 Simcrash caused by bots sitting on trees * DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant * QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 302e89eb07..7712d9d042 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_PATCH = 6; -const S32 LL_VERSION_BUILD = 76205; +const S32 LL_VERSION_BUILD = 76747; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3