summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-03-31 18:37:31 +0000
committerJosh Bell <josh@lindenlab.com>2008-03-31 18:37:31 +0000
commitecec626dec93524f7ef5831a5ba344d6449b99bc (patch)
treee59505c77cb1e9018ed5709a7ec24abe0ad8d167
parent32e11b2ef5e84bb7ccc985f34691f151afee64fc (diff)
svn merge -r 83166:83647 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Handful of changes from the production branch, mostly in the dataservices. Login.cgi changes to mitigate DB load and support A/B testing of the browser-hud work. Revert crash reporter behavior to 1.19.1 to avoid DB grief.
-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 04f7821f64..b87d054b3b 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 = 19;
const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 82965;
+const S32 LL_VERSION_BUILD = 83236;
const char * const LL_CHANNEL = "Second Life Server";