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
meow-7.2.2
Josh Bell 2008-01-03 19:53:12 +00:00
parent 2ec9ba8446
commit b6e2a894f5
1 changed files with 1 additions and 1 deletions

View File

@ -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";