From 820fbfd12a17c07745bc4bea9e5e95beb751c043 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 5 Oct 2011 18:20:28 +0200
Subject: [PATCH] - internal : reviewed for SL-3.0

--HG--
branch : Viewer-Build
---
 .hgpatchinfo/Viewer-Build.desc |  3 +++
 .hgtags                        | 15 +++++++++++++--
 indra/newview/llappviewer.cpp  |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc
index 9b1aba0779..0c3e17f0b5 100644
--- a/.hgpatchinfo/Viewer-Build.desc
+++ b/.hgpatchinfo/Viewer-Build.desc
@@ -6,7 +6,10 @@
     -> Windows only
 - changed : set the "FMOD" flag to TRUE for the (Windows) ReleaseOS build configuration
 - changed : set the "UNATTENDED" flag to FALSE for all (Windows) *OS build configurations
+- changed : updated OpenJPEG package with debug information for crash debugging
 - fixed   : *OS builds don't set the default Visual Studio project and configuration
 - fixed   : libpng is built with "Whole Program Optimization" and causing slow linker performance
     -> "MSIL .netmodule or module compiled with /GL found; restarting link with /LTCG; add /LTCG to the link command line to improve linker performance"
     -> causes the linker to abort the current run and start over
+- fixed   : viewer crashes or refuses to start when TeamViewer is installed or running
+    -> see http://jira.phoenixviewer.com/browse/FIRE-3062
diff --git a/.hgtags b/.hgtags
index 8f679bc22b..76bf21b720 100644
--- a/.hgtags
+++ b/.hgtags
@@ -186,6 +186,11 @@ e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2
 b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1
 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1
+0000000000000000000000000000000000000000 2.1.1-release
+0000000000000000000000000000000000000000 v2start
+0000000000000000000000000000000000000000 2-1rn1
+0000000000000000000000000000000000000000 2-1-beta-2
+0000000000000000000000000000000000000000 beta-5
 0000000000000000000000000000000000000000 beta-3-5
 0000000000000000000000000000000000000000 2-1-1-beta-1
 0000000000000000000000000000000000000000 2-1-beta-3
@@ -334,8 +339,13 @@ b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
 0000000000000000000000000000000000000000 2.8.0-release
 0000000000000000000000000000000000000000 DRTVWR-73_2.8.1-beta1
 0000000000000000000000000000000000000000 2.8.1-beta1
+0000000000000000000000000000000000000000 DRTVWR-72_2.8.1-release
+0000000000000000000000000000000000000000 2.8.1-release
+0000000000000000000000000000000000000000 DRTVWR-76_2.8.1-hotfix
+0000000000000000000000000000000000000000 2.8.1-hotfix
 0000000000000000000000000000000000000000 2.8.2-start
-0000000000000000000000000000000000000000 2.8.0-release
+0000000000000000000000000000000000000000 DRTVWR-72_2.8.1-release
+0000000000000000000000000000000000000000 2.8.1-release
 0000000000000000000000000000000000000000 2.8.3-start
 0000000000000000000000000000000000000000 DRTVWR-75_2.8.3-beta1
 0000000000000000000000000000000000000000 2.8.3-beta1
@@ -352,7 +362,7 @@ b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
 0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release
 0000000000000000000000000000000000000000 3.0.0-release
 0000000000000000000000000000000000000000 DRTVWR-83_3.0.2-beta1
-0000000000000000000000000000000000000000 3.0.2-beta14f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
+0000000000000000000000000000000000000000 3.0.2-beta1
 0000000000000000000000000000000000000000 DRTVWR-86_3.0.2-beta2
 0000000000000000000000000000000000000000 3.0.2-beta2
 0000000000000000000000000000000000000000 3.0.3-start
@@ -378,5 +388,6 @@ a9abb9633a266c8d2fe62411cfd1c86d32da72bf SL-2.7.1
 057f319dd8eccdf63a54d99686c68cdcb31b6abc SL-2.7.4
 6866d9df6efbd441c66451debd376d21211de39c SL-2.7.5
 493d9127ee50e84ba08a736a65a23ca86f7a5b01 SL-2-8-0
+29e93d7e19991011bd12b5748142b11a5dcb4370 SL-2.8.1
 fb85792b84bf28428889c4cc966469d92e5dac4c SL-2-8-3
 1778f26b6d0ae762dec3ca37140f66620f2485d9 SL-3-0-0
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ee0285198d..d24f16540c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1962,7 +1962,7 @@ void errorCallback(const std::string &error_string)
 	gLLErrorActivated = true;
 	
 //	LLError::crashAndLoop(error_string);
-// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.6.0a) | Added: Catznip-2.4.0g
+// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-3.0.0a) | Added: Catznip-2.4.0g
 #if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
 	DebugBreak();
 #else