diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 11:56:28 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 11:56:28 -0800 |
| commit | 98b2f622b709fcacac32e8ad23b8da6479a28a87 (patch) | |
| tree | d310b98155b9283c04f90b7506573178273d12a8 /indra/llcommon | |
| parent | 7365ee2d9d79813b6f515d333b63210d583038b5 (diff) | |
| parent | 9b0e4d20a96ad01de33ec6d4ff87cb2a15d36d58 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 5783ffe829..b19ba3bf74 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -30,7 +30,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 1; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 211776; +const S32 LL_VERSION_BUILD = 13828; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 5fa38db041..d6fa5b1997 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -30,12 +30,12 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 211776; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; #if LL_DARWIN -const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer"; +const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer"; #endif #endif |