Merged with viewer-sunshine tip (Revision bd1162cb6fbe)

--HG-- branch : Viewer-Build
2012-12-18 16:00:02 +01:00 · 2012-12-18 16:00:02 +01:00 · b79d5d7c58
parent 8eef31e47a 30122df50e
commit b79d5d7c58
7 changed files with 438 additions and 11 deletions
--- a/.hgpatchinfo/Viewer-Build.dep
+++ b/.hgpatchinfo/Viewer-Build.dep
@ -0,0 +1 @@
+bd1162cb6fbe7dc5a65d0de8fa56b9958b40b45d
--- a/.hgpatchinfo/Viewer-Build.desc
+++ b/.hgpatchinfo/Viewer-Build.desc
@ -0,0 +1,15 @@
+[Viewer/Build]
+- changed : compiler options for "Release with Debug" builds
+- changed : compiler and linker options for "Release" builds
+- changed : removed LL's changeset tags and added new (consistent) SL-X.Y.Z tags for releases
+- changed : break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds
+    -> 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
--- a/.hgtags
+++ b/.hgtags
@ -379,3 +379,407 @@ c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257
 452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259
 5cba5f39d0a81d659f24ebc4b5efd025a39e3db1 3.4.3-release
 9aa1aa9f1fe13c194695a0b8f0af298296241dc2 DRTVWR-260
+0000000000000000000000000000000000000000 v2start
+0000000000000000000000000000000000000000 alpha-3
+0000000000000000000000000000000000000000 fork to viewer-2-0
+0000000000000000000000000000000000000000 alpha-4
+0000000000000000000000000000000000000000 fork to viewer-20qa
+0000000000000000000000000000000000000000 alpha-5
+0000000000000000000000000000000000000000 howard-demo
+0000000000000000000000000000000000000000 alpha-6
+0000000000000000000000000000000000000000 beta-3-5
+0000000000000000000000000000000000000000 beta-4
+0000000000000000000000000000000000000000 beta-5
+0000000000000000000000000000000000000000 viewer-2-0-0
+0000000000000000000000000000000000000000 viewer-2-0-1
+0000000000000000000000000000000000000000 2-1rn1
+0000000000000000000000000000000000000000 viewer-2-0-2-start
+0000000000000000000000000000000000000000 viewer-2-1-0-start
+0000000000000000000000000000000000000000 2-1-beta-1
+0000000000000000000000000000000000000000 2-1-beta-2
+0000000000000000000000000000000000000000 2-1-beta-3
+0000000000000000000000000000000000000000 2-1-beta-4
+0000000000000000000000000000000000000000 2-1-release
+0000000000000000000000000000000000000000 2-1-1-beta-1
+0000000000000000000000000000000000000000 2-1-1-beta-2
+0000000000000000000000000000000000000000 2-1-1-release
+0000000000000000000000000000000000000000 2.1.1-release
+0000000000000000000000000000000000000000 last_sprint
+0000000000000000000000000000000000000000 2.2.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-5_2.2.0-beta1
+0000000000000000000000000000000000000000 beta_2.1.3
+0000000000000000000000000000000000000000 2.2.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-3_2.2.0-beta2
+0000000000000000000000000000000000000000 2.2.0-beta3
+0000000000000000000000000000000000000000 DRTVWR-7_2.2.0-beta3
+0000000000000000000000000000000000000000 2.2.0-beta4
+0000000000000000000000000000000000000000 2.2.0-release
+0000000000000000000000000000000000000000 DRTVWR-8_2.2.0-release
+0000000000000000000000000000000000000000 2.3.0-start
+0000000000000000000000000000000000000000 2.3.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-14_2.3.0-beta1
+0000000000000000000000000000000000000000 2.3.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-17_2.3.0-beta2
+0000000000000000000000000000000000000000 2.3.0-beta3
+0000000000000000000000000000000000000000 2.3.0-release
+0000000000000000000000000000000000000000 DRTVWR-13_2.3.0-release
+0000000000000000000000000000000000000000 DRTVWR-20_2.3.0-beta3
+0000000000000000000000000000000000000000 2.4.0-start
+0000000000000000000000000000000000000000 2.4.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-26_2.4.0-beta1
+0000000000000000000000000000000000000000 2.4.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-27_2.4.0-beta2
+0000000000000000000000000000000000000000 2.4.0-release
+0000000000000000000000000000000000000000 DRTVWR-25_2.4.0-release
+0000000000000000000000000000000000000000 2.5.0-start
+0000000000000000000000000000000000000000 2.5.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-32_2.5.0-beta1
+0000000000000000000000000000000000000000 2.5.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-33--2.5.0beta2
+0000000000000000000000000000000000000000 DRTVWR-33_2.5.0-beta2
+0000000000000000000000000000000000000000 2.5.0-beta3
+0000000000000000000000000000000000000000 2.5.0-release
+0000000000000000000000000000000000000000 DRTVWR-31_2.5.0-release
+0000000000000000000000000000000000000000 DRTVWR-34_2.5.0-beta3
+0000000000000000000000000000000000000000 nat-eventapi2-base
+0000000000000000000000000000000000000000 2.5.1-start
+0000000000000000000000000000000000000000 2.5.1-release
+0000000000000000000000000000000000000000 DRTVWR-37_2.5.1-release
+0000000000000000000000000000000000000000 2.5.2-release
+0000000000000000000000000000000000000000 DRTVWR-38_2.5.2-release
+0000000000000000000000000000000000000000 2.6.0-start
+0000000000000000000000000000000000000000 2.6.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-40_2.6.0-beta1
+0000000000000000000000000000000000000000 2.6.0-beta1-tip
+0000000000000000000000000000000000000000 2.6.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-41_2.6.0-beta2
+0000000000000000000000000000000000000000 2.6.0-release
+0000000000000000000000000000000000000000 DRTVWR-39_2.6.0-release
+0000000000000000000000000000000000000000 2.6.1-beta1
+0000000000000000000000000000000000000000 2.6.1-start
+0000000000000000000000000000000000000000 DRTVWR-43_2.6.1-beta1
+0000000000000000000000000000000000000000 2.6.1-release
+0000000000000000000000000000000000000000 DRTVWR-42_2.6.1-release
+0000000000000000000000000000000000000000 2.6.2-start
+0000000000000000000000000000000000000000 2.6.2-beta1
+0000000000000000000000000000000000000000 DRTVWR-45_2.6.2-beta1
+0000000000000000000000000000000000000000 2.6.2-release
+0000000000000000000000000000000000000000 DRTVWR-44_2.6.2-release
+0000000000000000000000000000000000000000 end-of-develop.py
+0000000000000000000000000000000000000000 2.6.3-start
+0000000000000000000000000000000000000000 2.6.3-beta1
+0000000000000000000000000000000000000000 DRTVWR-47_2.6.3-beta1
+0000000000000000000000000000000000000000 2.6.3-beta2
+0000000000000000000000000000000000000000 DRTVWR-48_2.6.3-beta2
+0000000000000000000000000000000000000000 2.6.3-release
+0000000000000000000000000000000000000000 DRTVWR-46_2.6.3-release
+0000000000000000000000000000000000000000 dons-headless-hackathon-work
+0000000000000000000000000000000000000000 2.6.5-beta1
+0000000000000000000000000000000000000000 DRTVWR-50_2.6.5-beta1
+0000000000000000000000000000000000000000 2.6.6-start
+0000000000000000000000000000000000000000 2.6.6-beta1
+0000000000000000000000000000000000000000 DRTVWR-52_2.6.6-beta1
+0000000000000000000000000000000000000000 2.6.6-release
+0000000000000000000000000000000000000000 DRTVWR-51_2.6.6-release
+0000000000000000000000000000000000000000 2.6.8-start
+0000000000000000000000000000000000000000 2.6.8-beta1
+0000000000000000000000000000000000000000 DRTVWR-55_2.6.8-beta1
+0000000000000000000000000000000000000000 2.6.8-release
+0000000000000000000000000000000000000000 DRTVWR-54_2.6.8-release
+0000000000000000000000000000000000000000 2.6.9-start
+0000000000000000000000000000000000000000 2.6.9-beta1
+0000000000000000000000000000000000000000 2.6.9-release
+0000000000000000000000000000000000000000 DRTVWR-56_2.6.9-release
+0000000000000000000000000000000000000000 DRTVWR-57_2.6.9-beta1
+0000000000000000000000000000000000000000 2.7.0-start
+0000000000000000000000000000000000000000 2.7.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-59_2.7.0-beta1
+0000000000000000000000000000000000000000 2.7.1-start
+0000000000000000000000000000000000000000 2.7.1-beta1
+0000000000000000000000000000000000000000 DRTVWR-61_2.7.1-beta1
+0000000000000000000000000000000000000000 2.7.2-start
+0000000000000000000000000000000000000000 2.7.2-beta1
+0000000000000000000000000000000000000000 DRTVWR-63_2.7.2-beta1
+0000000000000000000000000000000000000000 2.7.1-release
+0000000000000000000000000000000000000000 2.7.2-release
+0000000000000000000000000000000000000000 DRTVWR-60_2.7.1-release
+0000000000000000000000000000000000000000 DRTVWR-62_2.7.2-release
+0000000000000000000000000000000000000000 2.7.3-start
+0000000000000000000000000000000000000000 2.7.4-start
+0000000000000000000000000000000000000000 2.7.4-beta1
+0000000000000000000000000000000000000000 DRTVWR-67_2.7.4-beta1
+0000000000000000000000000000000000000000 2.7.4-release
+0000000000000000000000000000000000000000 DRTVWR-66_2.7.4-release
+0000000000000000000000000000000000000000 2.7.5-start
+0000000000000000000000000000000000000000 2.7.5-beta1
+0000000000000000000000000000000000000000 DRTVWR-69_2.7.5-beta1
+0000000000000000000000000000000000000000 2.7.5-release
+0000000000000000000000000000000000000000 DRTVWR-68_2.7.5-release
+0000000000000000000000000000000000000000 2.8.0-beta1
+0000000000000000000000000000000000000000 2.8.0-start
+0000000000000000000000000000000000000000 DRTVWR-71_2.8.0-beta1
+0000000000000000000000000000000000000000 2.8.0-release
+0000000000000000000000000000000000000000 DRTVWR-70_2.8.0-release
+0000000000000000000000000000000000000000 2.8.1-start
+0000000000000000000000000000000000000000 2.8.1-beta1
+0000000000000000000000000000000000000000 DRTVWR-73_2.8.1-beta1
+0000000000000000000000000000000000000000 2.8.1-release
+0000000000000000000000000000000000000000 DRTVWR-72_2.8.1-release
+0000000000000000000000000000000000000000 2.8.1-hotfix
+0000000000000000000000000000000000000000 DRTVWR-76_2.8.1-hotfix
+0000000000000000000000000000000000000000 2.8.2-start
+0000000000000000000000000000000000000000 2.8.3-start
+0000000000000000000000000000000000000000 2.8.3-beta1
+0000000000000000000000000000000000000000 DRTVWR-75_2.8.3-beta1
+0000000000000000000000000000000000000000 2.8.3-release
+0000000000000000000000000000000000000000 DRTVWR-74_2.8.3-release
+0000000000000000000000000000000000000000 3.0.0-start
+0000000000000000000000000000000000000000 3.0.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-beta1
+0000000000000000000000000000000000000000 3.0.0-release
+0000000000000000000000000000000000000000 DRTVWR-77_3.0.0-release
+0000000000000000000000000000000000000000 3.0.1-start
+0000000000000000000000000000000000000000 3.0.1-beta1
+0000000000000000000000000000000000000000 DRTVWR-81_3.0.1-beta1
+0000000000000000000000000000000000000000 3.0.2-start
+0000000000000000000000000000000000000000 3.0.2-beta1
+0000000000000000000000000000000000000000 DRTVWR-83_3.0.2-beta1
+0000000000000000000000000000000000000000 3.0.2-beta2
+0000000000000000000000000000000000000000 DRTVWR-86_3.0.2-beta2
+0000000000000000000000000000000000000000 3.0.3-start
+0000000000000000000000000000000000000000 3.0.3-beta1
+0000000000000000000000000000000000000000 DRTVWR-85_3.0.3-beta1
+0000000000000000000000000000000000000000 3.0.3-beta2
+0000000000000000000000000000000000000000 DRTVWR-89_3.0.3-beta2
+0000000000000000000000000000000000000000 3.0.3-release
+0000000000000000000000000000000000000000 DRTVWR-84_3.0.3-release
+0000000000000000000000000000000000000000 3.0.4-start
+0000000000000000000000000000000000000000 3.0.5-start
+0000000000000000000000000000000000000000 3.1.0-start
+0000000000000000000000000000000000000000 3.1.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-93_3.1.0-beta1
+0000000000000000000000000000000000000000 3.1.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-96_3.1.0-beta2
+0000000000000000000000000000000000000000 3.1.0-release
+0000000000000000000000000000000000000000 DRTVWR-92_3.1.0-release
+0000000000000000000000000000000000000000 3.2.0-start
+0000000000000000000000000000000000000000 3.2.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-95_3.2.0-beta1
+0000000000000000000000000000000000000000 3.2.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-97_3.2.0-beta2
+0000000000000000000000000000000000000000 3.2.0-beta3
+0000000000000000000000000000000000000000 DRTVWR-98_3.2.0-beta3
+0000000000000000000000000000000000000000 3.2.0-release
+0000000000000000000000000000000000000000 DRTVWR-94_3.2.0-release
+0000000000000000000000000000000000000000 3.2.1-start
+0000000000000000000000000000000000000000 3.2.1-beta1
+0000000000000000000000000000000000000000 DRTVWR-100_3.2.1-beta1
+0000000000000000000000000000000000000000 3.2.1-release
+0000000000000000000000000000000000000000 DRTVWR-99_3.2.1-release
+0000000000000000000000000000000000000000 3.2.2-start
+0000000000000000000000000000000000000000 3.2.2-beta1
+0000000000000000000000000000000000000000 DRTVWR-102_3.2.2-beta1
+0000000000000000000000000000000000000000 3.2.3-start
+0000000000000000000000000000000000000000 3.2.4-beta1
+0000000000000000000000000000000000000000 3.2.4-start
+0000000000000000000000000000000000000000 DRTVWR-104_3.2.4-beta1
+0000000000000000000000000000000000000000 3.2.4-release
+0000000000000000000000000000000000000000 DRTVWR-103_3.2.4-release
+0000000000000000000000000000000000000000 3.2.5-start
+0000000000000000000000000000000000000000 3.2.5-beta1
+0000000000000000000000000000000000000000 DRTVWR-106_3.2.5-beta1
+0000000000000000000000000000000000000000 3.2.5-beta2
+0000000000000000000000000000000000000000 DRTVWR-107_3.2.5-beta2
+0000000000000000000000000000000000000000 3.2.5-release
+0000000000000000000000000000000000000000 DRTVWR-105_3.2.5-release
+0000000000000000000000000000000000000000 3.2.6-start
+0000000000000000000000000000000000000000 3.2.6-beta1
+0000000000000000000000000000000000000000 DRTVWR-109_3.2.6-beta1
+0000000000000000000000000000000000000000 3.2.7-start
+0000000000000000000000000000000000000000 3.2.7-beta1
+0000000000000000000000000000000000000000 DRTVWR-111_3.2.7-beta1
+0000000000000000000000000000000000000000 3.2.8-start
+0000000000000000000000000000000000000000 3.2.8-beta1
+0000000000000000000000000000000000000000 DRTVWR-114_3.2.8-beta1
+0000000000000000000000000000000000000000 3.2.8-beta2
+0000000000000000000000000000000000000000 DRTVWR-115_3.2.8-beta2
+0000000000000000000000000000000000000000 3.2.8-release
+0000000000000000000000000000000000000000 DRTVWR-113_3.2.8-release
+0000000000000000000000000000000000000000 3.2.9-start
+0000000000000000000000000000000000000000 3.2.9-beta1
+0000000000000000000000000000000000000000 DRTVWR-117_3.2.9-beta1
+0000000000000000000000000000000000000000 3.2.9-beta2
+0000000000000000000000000000000000000000 DRTVWR-118_3.2.9-beta2
+0000000000000000000000000000000000000000 3.3.0-beta1
+0000000000000000000000000000000000000000 3.3.0-start
+0000000000000000000000000000000000000000 DRTVWR-119
+0000000000000000000000000000000000000000 3.3.0-release
+0000000000000000000000000000000000000000 3.3.1-start
+0000000000000000000000000000000000000000 DRTVWR-125
+0000000000000000000000000000000000000000 3.3.1-beta1
+0000000000000000000000000000000000000000 3.3.1-beta2
+0000000000000000000000000000000000000000 DRTVWR-139
+0000000000000000000000000000000000000000 viewer-beta-candidate
+0000000000000000000000000000000000000000 3.3.1-release
+0000000000000000000000000000000000000000 3.3.2-beta1
+0000000000000000000000000000000000000000 3.3.2-beta2
+0000000000000000000000000000000000000000 3.3.2-release
+0000000000000000000000000000000000000000 viewer-release-candidate
+0000000000000000000000000000000000000000 DRTVWR-156
+0000000000000000000000000000000000000000 DRTVWR-148
+0000000000000000000000000000000000000000 DRTVWR-155
+0000000000000000000000000000000000000000 DRTVWR-153
+0000000000000000000000000000000000000000 DRTVWR-159
+0000000000000000000000000000000000000000 DRTVWR-157
+0000000000000000000000000000000000000000 DRTVWR-160
+0000000000000000000000000000000000000000 3.3.3-beta1
+0000000000000000000000000000000000000000 DRTVWR-144
+0000000000000000000000000000000000000000 DRTVWR-161
+0000000000000000000000000000000000000000 DRTVWR-162
+0000000000000000000000000000000000000000 DRTVWR-163
+0000000000000000000000000000000000000000 DRTVWR-164
+0000000000000000000000000000000000000000 DRTVWR-165
+0000000000000000000000000000000000000000 3.3.3-beta2
+0000000000000000000000000000000000000000 DRTVWR-169
+0000000000000000000000000000000000000000 3.3.3-beta3
+0000000000000000000000000000000000000000 3.3.3-release
+0000000000000000000000000000000000000000 DRTVWR-171
+0000000000000000000000000000000000000000 DRTVWR-168
+0000000000000000000000000000000000000000 DRTVWR-170
+0000000000000000000000000000000000000000 DRTVWR-158
+0000000000000000000000000000000000000000 3.3.4-beta1
+0000000000000000000000000000000000000000 DRTVWR-167
+0000000000000000000000000000000000000000 DRTVWR-173
+0000000000000000000000000000000000000000 DRTVWR-174
+0000000000000000000000000000000000000000 3.3.4-beta2
+0000000000000000000000000000000000000000 DRTVWR-176
+0000000000000000000000000000000000000000 DRTVWR-177
+0000000000000000000000000000000000000000 3.3.4-beta3
+0000000000000000000000000000000000000000 DRTVWR-175
+0000000000000000000000000000000000000000 DRTVWR-180
+0000000000000000000000000000000000000000 DRTVWR-183
+0000000000000000000000000000000000000000 3.3.4-beta4
+0000000000000000000000000000000000000000 DRTVWR-184
+0000000000000000000000000000000000000000 3.3.4-beta5
+0000000000000000000000000000000000000000 3.3.4-release
+0000000000000000000000000000000000000000 DRTVWR-182
+0000000000000000000000000000000000000000 3.4.0-beta1
+0000000000000000000000000000000000000000 DRTVWR-186
+0000000000000000000000000000000000000000 DRTVWR-190
+0000000000000000000000000000000000000000 DRTVWR-181
+0000000000000000000000000000000000000000 DRTVWR-188
+0000000000000000000000000000000000000000 DRTVWR-189
+0000000000000000000000000000000000000000 DRTVWR-192
+0000000000000000000000000000000000000000 DRTVWR-191
+0000000000000000000000000000000000000000 DRTVWR-195
+0000000000000000000000000000000000000000 DRTVWR-193
+0000000000000000000000000000000000000000 DRTVWR-194
+0000000000000000000000000000000000000000 DRTVWR-196
+0000000000000000000000000000000000000000 DRTVWR-198
+0000000000000000000000000000000000000000 DRTVWR-197
+0000000000000000000000000000000000000000 3.4.0-beta2
+0000000000000000000000000000000000000000 DRTVWR-200
+0000000000000000000000000000000000000000 3.4.0-beta3
+0000000000000000000000000000000000000000 DRTVWR-203
+0000000000000000000000000000000000000000 DRTVWR-199
+0000000000000000000000000000000000000000 3.3.4-release2
+0000000000000000000000000000000000000000 DRTVWR-201
+0000000000000000000000000000000000000000 3.4.0-beta4
+0000000000000000000000000000000000000000 DRTVWR-202
+0000000000000000000000000000000000000000 3.4.0-beta5
+0000000000000000000000000000000000000000 oz-build-test-tag
+0000000000000000000000000000000000000000 DRTVWR-205
+0000000000000000000000000000000000000000 DRTVWR-206
+0000000000000000000000000000000000000000 DRTVWR-207
+0000000000000000000000000000000000000000 3.3.4-release3
+0000000000000000000000000000000000000000 DRTVWR-212
+0000000000000000000000000000000000000000 DRTVWR-213
+0000000000000000000000000000000000000000 3.3.4-beta6
+0000000000000000000000000000000000000000 DRTVWR-215
+0000000000000000000000000000000000000000 3.4.0-beta7
+0000000000000000000000000000000000000000 3.4.0-release
+0000000000000000000000000000000000000000 3.4.1-beta1
+0000000000000000000000000000000000000000 3.4.1-beta1a
+0000000000000000000000000000000000000000 DRTVWR-219
+0000000000000000000000000000000000000000 DRTVWR-220
+0000000000000000000000000000000000000000 DRTVWR-221
+0000000000000000000000000000000000000000 3.4.1-beta3
+0000000000000000000000000000000000000000 DRTVWR-222
+0000000000000000000000000000000000000000 3.4.1-beta4
+0000000000000000000000000000000000000000 DRTVWR-224
+0000000000000000000000000000000000000000 3.4.1-beta5
+0000000000000000000000000000000000000000 DRTVWR-226
+0000000000000000000000000000000000000000 DRTVWR-179
+0000000000000000000000000000000000000000 3.4.1-beta6
+0000000000000000000000000000000000000000 DRTVWR-227
+0000000000000000000000000000000000000000 3.4.1-beta7
+0000000000000000000000000000000000000000 DRTVWR-228
+0000000000000000000000000000000000000000 3.4.1-beta8
+0000000000000000000000000000000000000000 DRTVWR-231
+0000000000000000000000000000000000000000 DRTVWR-233
+0000000000000000000000000000000000000000 3.4.1-beta9
+0000000000000000000000000000000000000000 3.4.1-beta10
+0000000000000000000000000000000000000000 DRTVWR-235
+0000000000000000000000000000000000000000 DRTVWR-236
+0000000000000000000000000000000000000000 3.4.1-beta11
+0000000000000000000000000000000000000000 DRTVWR-237
+0000000000000000000000000000000000000000 3.4.1-beta12
+0000000000000000000000000000000000000000 3.4.1-release
+0000000000000000000000000000000000000000 DRTVWR-217
+0000000000000000000000000000000000000000 3.4.2-beta1
+0000000000000000000000000000000000000000 DRTVWR-208
+0000000000000000000000000000000000000000 DRTVWR-223
+0000000000000000000000000000000000000000 DRTVWR-216
+0000000000000000000000000000000000000000 3.4.2-beta2
+0000000000000000000000000000000000000000 DRTVWR-240
+0000000000000000000000000000000000000000 DRTVWR-242
+0000000000000000000000000000000000000000 3.4.2-beta3
+0000000000000000000000000000000000000000 DRTVWR-209
+0000000000000000000000000000000000000000 DRTVWR-238
+0000000000000000000000000000000000000000 DRTVWR-210
+0000000000000000000000000000000000000000 DRTVWR-243
+0000000000000000000000000000000000000000 3.4.2-beta4
+0000000000000000000000000000000000000000 DRTVWR-241
+0000000000000000000000000000000000000000 DRTVWR-232
+0000000000000000000000000000000000000000 DRTVWR-245
+0000000000000000000000000000000000000000 3.4.3-beta1
+4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
+668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1
+b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0
+bb38ff1a763738609e1b3cada6d15fa61e5e84b9 SL-2.1.1
+1415e6538d54fd5d568ee88343424d57c6803c2c SL-2.2.0
+6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 SL-2.3.0
+1ed382c6a08ba3850b6ce9061bc551ddece0ea07 SL-2.4.0
+b723921b5c711bd24dbe77dc76ef488b544dac78 SL-2.5.0
+4dede9ae1ec74d41f6887719f6f1de7340d8578d SL-2.5.1
+b53a0576eec80614d7767ed72b40ed67aeff27c9 SL-2.5.2
+42f32494bac475d0737799346f6831558ae8bf5d SL-2.6.0
+c9182ed77d427c759cfacf49a7b71a2e20d522aa SL-2.6.1
+214180ad5714ce8392b82bbebcc92f4babd98300 SL-2.6.2
+8f2da1701c81a62352df2b8d413d27fb2cade9a6 SL-2.6.3
+dac76a711da5f1489a01c1fa62ec97d99c25736d SL-2.6.6
+be2000b946f8cb3de5f44b2d419287d4c48ec4eb SL-2.6.8
+77e5a08344c95738ab879f9671b7758cddd712a3 SL-2.6.9
+a9abb9633a266c8d2fe62411cfd1c86d32da72bf SL-2.7.1
+fe3a8e7973072ea62043c08b19b66626c1a720eb SL-2.7.2
+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
+0496d2f74043cf4e6058e76ac3db03d44cff42ce SL-3.0.3
+ae2de7b0b33c03dc5bdf3a7bfa54463b512221b2 SL-3.1.0
+3150219d229d628f0c15e58e8a51511cbd97e58d SL-3.2.0
+a8c7030d6845186fac7c188be4323a0e887b4184 SL-3.2.1
+bd6bcde2584491fd9228f1fa51c4575f4e764e19 SL-3.2.4
+c6175c955a19e9b9353d242889ec1779b5762522 SL-3.2.5
+51b2fd52e36aab8f670e0874e7e1472434ec4b4a SL-3.2.8
+5e8d2662f38a66eca6c591295f5880d47afc73f7 SL-3.3.0
+c623bbc854b6f7ee1b33a3718f76715046aa2937 SL-3.3.1
+675668bd24d3bea570814f71762a2a806f7e1b8d SL-3.3.2
+6428242e124b523813bfaf4c45b3d422f0298c81 SL-3.3.3
+28e100d0379a2b0710c57647a28fc5239d3d7b99 SL-3.3.4
+97977c67245f52db20eb15f1918cc0f24778cabc SL-3.4.0
+e59ffd3fe0838ae6b09b242a6e9df71761b88f41 SL-3.4.1
+16310aabccf315870f7cc9bf966926c0ad6954fa SL-3.4.2
--- a/autobuild.xml
+++ b/autobuild.xml
@ -1218,9 +1218,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>f194ba857ca8dd86483a3ef24535d0db</string>
+              <string>73a1892bcbaaecdf369a7884efb46049</string>
              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/226532/arch/CYGWIN/installer/libpng-1.5.1-windows-20110413.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/libpng-1.5.1-windows-20110619.tar.bz2</string>
            </map>
            <key>name</key>
            <string>windows</string>
@ -1700,9 +1700,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>ca5765af55f798724d601720afdf6953</string>
+              <string>2fbd3c2523c45923245b55551fae5e53</string>
              <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-windows-20110302.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/openjpeg-1.4-windows-20110622.tar.bz2</string>
            </map>
            <key>name</key>
            <string>windows</string>
@ -2505,7 +2505,7 @@
                <array>
                  <string>-G</string>
                  <string>"Visual Studio 10"</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUNATTENDED:BOOL=OFF</string>
                  <string>-DUSE_KDU=FALSE</string>
                  <string>-DFMOD=FALSE</string>
                </array>
@ -2593,7 +2593,7 @@
                <array>
                  <string>-G</string>
                  <string>"Visual Studio 10"</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUNATTENDED:BOOL=OFF</string>
                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                  <string>-DUSE_KDU=FALSE</string>
                  <string>-DFMOD=FALSE</string>
@ -2681,10 +2681,10 @@
                <array>
                  <string>-G</string>
                  <string>"Visual Studio 10"</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUNATTENDED:BOOL=OFF</string>
                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DFMOD=FALSE</string>
+                  <string>-DFMOD=TRUE</string>
                </array>
              </map>
              <key>name</key>
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@ -49,10 +49,10 @@ if (WINDOWS)
  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
      CACHE STRING "C++ compiler debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob0 -D_SECURE_STL=0"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Ob0 /Gm -D_SECURE_STL=0"
      CACHE STRING "C++ compiler release-with-debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 /Oi /Ot /GF /Gy /arch:SSE2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
      CACHE STRING "C++ compiler release options" FORCE)
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")

--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@ -1568,7 +1568,7 @@ if (WINDOWS)
        # *TODO -reenable this once we get server usage sorted out
        LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS} /LARGEADDRESSAWARE"
        LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO /LARGEADDRESSAWARE"
-        LINK_FLAGS_RELEASE "/FORCE:MULTIPLE /MAP\"secondlife-bin.MAP\" /OPT:REF /LARGEADDRESSAWARE"
+        LINK_FLAGS_RELEASE "/MAP\"secondlife-bin.MAP\" /OPT:REF /LARGEADDRESSAWARE"
        )
    if(USE_PRECOMPILED_HEADERS)
        set_target_properties(
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@ -2141,7 +2141,14 @@ void errorCallback(const std::string &error_string)
 	//Set the ErrorActivated global so we know to create a marker file
 	gLLErrorActivated = true;
 	
+//	LLError::crashAndLoop(error_string);
+// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.4)
+#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+	DebugBreak();
+#else
 	LLError::crashAndLoop(error_string);
+#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS
+// [/SL:KB]
 }

 bool LLAppViewer::initLogging()