Skip to content
Snippets Groups Projects
Commit b6e2a894 authored by Josh Bell's avatar Josh Bell
Browse files

svn merge -r76207:76805...

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
parent 2ec9ba84
No related branches found
No related tags found
No related merge requests found
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment