diff options
| author | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
|---|---|---|
| committer | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
| commit | 68988bddebfaf63314ded09e7ec6bade8b7bb951 (patch) | |
| tree | 0b740ed607c157e9714b4c46c32afa5d9ce6c90d /indra/llcommon/llversionserver.h | |
| parent | acc8ae40cdb2f57969ab57e1e8e6ec505a50d02b (diff) | |
svn merge -r84476:84911 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server
Includes pullout of migrate-start-location-2, webservice changes made to 1.20, DEV-7229, and other web-ds changes. Reviewed by Josh.
Diffstat (limited to 'indra/llcommon/llversionserver.h')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 9d98f945dd..3a53baf188 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 = 20; +const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 84396; +const S32 LL_VERSION_BUILD = 84509; const char * const LL_CHANNEL = "Second Life Server"; |