summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-02-29 01:18:00 +0000
committerJosh Bell <josh@lindenlab.com>2008-02-29 01:18:00 +0000
commit39affbc54410569eb5694f30d10b9edd591f0f5f (patch)
tree06a2348990a490ccb5aef282a1ebe4dee7aa5171 /indra/llcommon/llversionviewer.h
parent2fdd7c35f33d1d98091547b8e96ad9ebf99dee47 (diff)
svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
* Respect pre-1.19.0 voice settings * Re-fix DEV-11213 "SECURITY: Web site can use IFRAME to launch SL and steal your password"
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 f8b193d643..65db226ff9 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 4;
+const S32 LL_VERSION_BUILD = 5;
const char * const LL_CHANNEL = "Second Life Release";