summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2008-10-20 22:16:40 +0000
committerMark Palange <palange@lindenlab.com>2008-10-20 22:16:40 +0000
commit04decf22b9982aa8914024556ac11ce8c6f322a0 (patch)
tree35cbcc906763bd3b2abccccd1864213cfa59f1de /indra/llcommon/llversionviewer.h
parentd0e62db34ebda571db3ad78ca138275c4e84e47f (diff)
Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-rw-r--r--indra/llcommon/llversionviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ab182b8b5d..092eadd303 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 21;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 100000;
const char * const LL_CHANNEL = "Second Life Release";