From 39affbc54410569eb5694f30d10b9edd591f0f5f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 29 Feb 2008 01:18:00 +0000
Subject: 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"
---
 indra/llcommon/llversionviewer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon')

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";
 
-- 
cgit v1.2.3