diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-03 19:53:12 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-03 19:53:12 +0000 |
| commit | b6e2a894f524b4dab1f3bb80572920fe926ed4c2 (patch) | |
| tree | b59136b43b55cc81f307b8c51c1f48a97082d7ea | |
| parent | 2ec9ba8446dcdf004b6410cc6b9d641c41b4282b (diff) | |
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
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |