summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionserver.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-14 10:55:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-14 10:55:25 -0700
commitbaf9b3cb078c04b019fccc4ae8a54db05b14bdef (patch)
treeaa422043ec900036716d35e73240efc9df152d32 /indra/llcommon/llversionserver.h
parent76cf9e29a77566c10da6184833fad6b0912e9688 (diff)
parentfbc95fe7e77ed093f8f7938a4755ce6b175dcaff (diff)
Merge
Diffstat (limited to 'indra/llcommon/llversionserver.h')
-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 e3663544db..87fe7001e0 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -33,10 +33,10 @@
#ifndef LL_LLVERSIONSERVER_H
#define LL_LLVERSIONSERVER_H
-const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 31;
+const S32 LL_VERSION_MAJOR = 2;
+const S32 LL_VERSION_MINOR = 1;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 203110;
+const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Server";