summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-18 16:33:15 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-18 16:33:15 -0400
commit05739cf8ac8cf0217e252842b92f154691858edf (patch)
tree48f4e9e712bec71dd23d305f3f0337cfa6b41a80 /indra/llcommon
parent3380c7d9a22a528924c1ebd5fac1005ddaec3934 (diff)
parent128c3dfc74fd02860f199359071b32ea5119033d (diff)
Merged my recent viewer/viewer-20 + login-api merge with latest login-api including DLL hell library changes.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionserver.h2
-rw-r--r--indra/llcommon/llversionviewer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 77a03879bf..aee7c6ee1e 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 31;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2639;
+const S32 LL_VERSION_BUILD = 2822;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ccea101cd6..ca5bcb5a95 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 0;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 2639;
+const S32 LL_VERSION_BUILD = 2822;
const char * const LL_CHANNEL = "Second Life 2009";