summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-02-05 20:33:28 +0000
committerJosh Bell <josh@lindenlab.com>2008-02-05 20:33:28 +0000
commita9f2d6dcf56402f7043eb7ceb674e010831cf6c1 (patch)
tree082d7d8c0d79935d2a8873058cd62f4bfaf67d37 /indra
parent485c7ee0e2ebc2223c35fbb59a569ed889a1193c (diff)
svn merge -r 78407:79136 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release
* Fix for login script "active gestures" query causing massive inv db load * DEV-9755 - calling llEscapeURL with an empty string crashes the simulator * DEV-7007 - Block users who are limited to a subestate from connecting to any other subestate on login. * Revert maintenance-4/indra/dataserver/lldatainventory.cpp r74862 due to bad query performance * Make llEscape() behavior match previous behavior (and curl) * DEV-9871 - Record of land sale transaction in 1.19.0 regions failing to update in World/CSR NOTE: There are more changes after 79136 that need to get merged, but they haven't been through QA
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionserver.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 7712d9d042..35857b3640 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
#define LL_LLVERSIONSERVER_H
const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 6;
-const S32 LL_VERSION_BUILD = 76747;
+const S32 LL_VERSION_MINOR = 19;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 78407;
const char * const LL_CHANNEL = "Second Life Server";