summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-02-20 23:03:35 +0000
committerJosh Bell <josh@lindenlab.com>2008-02-20 23:03:35 +0000
commit0f30a85db9d29f0dfe2accb376904266dcf60124 (patch)
tree589adc38133f1a57e273a93ef6cc62c6e36257df
parent903292ba6779daabdb25cf22862cef6907a81f3d (diff)
svn merge -r 80160:80357 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
* DEV-10645 Log old-style searches to compare frequency/terms versus new search (LLLog) * MapNameRequest was accidentally enabled - now disabled * Add support for slave.mysql.GRID to generate-indra-xml.pl * QAR-293 Fix for hardcoded TTLs in web dataservices * Updated version numbers
-rw-r--r--indra/llcommon/llversionserver.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 35857b3640..b7c525be98 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -34,8 +34,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 78407;
+const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_BUILD = 80264;
const char * const LL_CHANNEL = "Second Life Server";