summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-05-02 21:44:39 +0000
committerJosh Bell <josh@lindenlab.com>2008-05-02 21:44:39 +0000
commiteb14fece837683ebc58540d7f10eb74f5a5fbd4e (patch)
tree199c04743ca5dc288e27576d82fcbe0d074c95c2 /indra/llcommon
parent36fccc3888c5dc318a8a235da8a5cae4faeb637d (diff)
svn merge -r 86069:86558 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
* QAR-522 / DEV-14318: Crash in LLSD:operator[] -- web connected? Traceback includes LLCurl::Responder::completed * landstore-6 dataservices * DEV-14141 - Enable avatar-properties. done 2008-05-01 14:00 * new query, for use by sl.com /lib/models/login.php * disabling evil slave crashing query. Also the following which has NOT been pushed into production yet * QAR-531 DEV-14457 SEC-67 Hacked client can bypass estate access lists
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionserver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index aeab793c9a..291f6d6347 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 = 21;
const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 85989;
+const S32 LL_VERSION_BUILD = 86526;
const char * const LL_CHANNEL = "Second Life Server";