diff --git a/.hgpatchinfo/Viewer-Build.dep b/.hgpatchinfo/Viewer-Build.dep new file mode 100644 index 0000000000..43150ee1f3 --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.dep @@ -0,0 +1 @@ +a82eb9becc151ae5689c6746590665bda209bcdc \ No newline at end of file diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc new file mode 100644 index 0000000000..e6644ff80a --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.desc @@ -0,0 +1,8 @@ +[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 "UNATTENDED" flag to FALSE for all (Windows) *OS build configurations +- fixed : viewer fails to compile with only the Windows 8 SDK installed diff --git a/.hgtags b/.hgtags index 209f17c332..9eaa15ec78 100755 --- a/.hgtags +++ b/.hgtags @@ -503,3 +503,597 @@ afd8d4756e8eda3c8f760625d1c17a2ad40ad6c8 3.7.27-release 566874eb5ab26c003ef7fb0e22ce40c5fa0013f4 3.7.28-release d07f76c5b9860fb87924d00ca729f7d4532534d6 3.7.29-release 67edc442c80b8d2fadd2a6c4a7184b469906cdbf 3.7.30-release +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-160 +0000000000000000000000000000000000000000 3.3.3-beta1 +0000000000000000000000000000000000000000 DRTVWR-144 +0000000000000000000000000000000000000000 DRTVWR-164 +0000000000000000000000000000000000000000 DRTVWR-162 +0000000000000000000000000000000000000000 DRTVWR-165 +0000000000000000000000000000000000000000 3.3.3-beta2 +0000000000000000000000000000000000000000 DRTVWR-169 +0000000000000000000000000000000000000000 3.3.3-beta3 +0000000000000000000000000000000000000000 3.3.3-release +0000000000000000000000000000000000000000 DRTVWR-159 +0000000000000000000000000000000000000000 DRTVWR-157 +0000000000000000000000000000000000000000 DRTVWR-161 +0000000000000000000000000000000000000000 DRTVWR-163 +0000000000000000000000000000000000000000 DRTVWR-171 +0000000000000000000000000000000000000000 DRTVWR-168 +0000000000000000000000000000000000000000 DRTVWR-170 +0000000000000000000000000000000000000000 DRTVWR-158 +0000000000000000000000000000000000000000 3.3.4-beta1 +0000000000000000000000000000000000000000 DRTVWR-173 +0000000000000000000000000000000000000000 DRTVWR-174 +0000000000000000000000000000000000000000 3.3.4-beta2 +0000000000000000000000000000000000000000 DRTVWR-176 +0000000000000000000000000000000000000000 DRTVWR-177 +0000000000000000000000000000000000000000 3.3.4-beta3 +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-199 +0000000000000000000000000000000000000000 3.3.4-release2 +0000000000000000000000000000000000000000 DRTVWR-207 +0000000000000000000000000000000000000000 3.3.4-release3 +0000000000000000000000000000000000000000 DRTVWR-167 +0000000000000000000000000000000000000000 DRTVWR-175 +0000000000000000000000000000000000000000 DRTVWR-182 +0000000000000000000000000000000000000000 3.4.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-189 +0000000000000000000000000000000000000000 DRTVWR-190 +0000000000000000000000000000000000000000 DRTVWR-192 +0000000000000000000000000000000000000000 DRTVWR-195 +0000000000000000000000000000000000000000 DRTVWR-193 +0000000000000000000000000000000000000000 DRTVWR-196 +0000000000000000000000000000000000000000 DRTVWR-198 +0000000000000000000000000000000000000000 DRTVWR-197 +0000000000000000000000000000000000000000 3.4.0-beta2 +0000000000000000000000000000000000000000 DRTVWR-200 +0000000000000000000000000000000000000000 3.4.0-beta3 +0000000000000000000000000000000000000000 DRTVWR-201 +0000000000000000000000000000000000000000 3.4.0-beta4 +0000000000000000000000000000000000000000 3.4.0-beta5 +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-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-186 +0000000000000000000000000000000000000000 DRTVWR-181 +0000000000000000000000000000000000000000 DRTVWR-188 +0000000000000000000000000000000000000000 DRTVWR-191 +0000000000000000000000000000000000000000 DRTVWR-194 +0000000000000000000000000000000000000000 DRTVWR-203 +0000000000000000000000000000000000000000 DRTVWR-202 +0000000000000000000000000000000000000000 oz-build-test-tag +0000000000000000000000000000000000000000 DRTVWR-205 +0000000000000000000000000000000000000000 DRTVWR-206 +0000000000000000000000000000000000000000 DRTVWR-219 +0000000000000000000000000000000000000000 DRTVWR-217 +0000000000000000000000000000000000000000 3.4.2-beta1 +0000000000000000000000000000000000000000 DRTVWR-216 +0000000000000000000000000000000000000000 3.4.2-beta2 +0000000000000000000000000000000000000000 DRTVWR-242 +0000000000000000000000000000000000000000 3.4.2-beta3 +0000000000000000000000000000000000000000 DRTVWR-243 +0000000000000000000000000000000000000000 3.4.2-beta4 +0000000000000000000000000000000000000000 3.4.2-release +0000000000000000000000000000000000000000 DRTVWR-208 +0000000000000000000000000000000000000000 DRTVWR-223 +0000000000000000000000000000000000000000 DRTVWR-240 +0000000000000000000000000000000000000000 DRTVWR-209 +0000000000000000000000000000000000000000 DRTVWR-238 +0000000000000000000000000000000000000000 DRTVWR-210 +0000000000000000000000000000000000000000 DRTVWR-241 +0000000000000000000000000000000000000000 DRTVWR-232 +0000000000000000000000000000000000000000 DRTVWR-245 +0000000000000000000000000000000000000000 3.4.3-beta1 +0000000000000000000000000000000000000000 DRTVWR-252 +0000000000000000000000000000000000000000 DRTVWR-251 +0000000000000000000000000000000000000000 DRTVWR-253 +0000000000000000000000000000000000000000 DRTVWR-254 +0000000000000000000000000000000000000000 DRTVWR-256 +0000000000000000000000000000000000000000 DRTVWR-258 +0000000000000000000000000000000000000000 DRTVWR-257 +0000000000000000000000000000000000000000 DRTVWR-259 +0000000000000000000000000000000000000000 DRTVWR-265 +0000000000000000000000000000000000000000 DRTVWR-266 +0000000000000000000000000000000000000000 DRTVWR-267 +0000000000000000000000000000000000000000 3.4.3-beta3 +0000000000000000000000000000000000000000 3.4.3-release +0000000000000000000000000000000000000000 DRTVWR-229 +0000000000000000000000000000000000000000 DRTVWR-246 +0000000000000000000000000000000000000000 DRTVWR-247 +0000000000000000000000000000000000000000 DRTVWR-249 +0000000000000000000000000000000000000000 DRTVWR-230 +0000000000000000000000000000000000000000 DRTVWR-255 +0000000000000000000000000000000000000000 DRTVWR-260 +0000000000000000000000000000000000000000 DRTVWR-244 +0000000000000000000000000000000000000000 3.4.4-beta1 +0000000000000000000000000000000000000000 DRTVWR-270 +0000000000000000000000000000000000000000 3.4.4-beta2 +0000000000000000000000000000000000000000 DRTVWR-271 +0000000000000000000000000000000000000000 3.4.4-beta3 +0000000000000000000000000000000000000000 DRTVWR-273 +0000000000000000000000000000000000000000 DRTVWR-275 +0000000000000000000000000000000000000000 3.4.4-beta4 +0000000000000000000000000000000000000000 3.4.4-release +0000000000000000000000000000000000000000 DRTVWR-268 +0000000000000000000000000000000000000000 DRTVWR-272 +0000000000000000000000000000000000000000 DRTVWR-269 +0000000000000000000000000000000000000000 DRTVWR-250 +0000000000000000000000000000000000000000 DRTVWR-277 +0000000000000000000000000000000000000000 DRTVWR-276 +0000000000000000000000000000000000000000 DRTVWR-279 +0000000000000000000000000000000000000000 DRTVWR-280 +0000000000000000000000000000000000000000 3.4.5-beta1 +0000000000000000000000000000000000000000 DRTVWR-281 +0000000000000000000000000000000000000000 DRTVWR-283 +0000000000000000000000000000000000000000 3.4.5-beta2 +0000000000000000000000000000000000000000 DRTVWR-286 +0000000000000000000000000000000000000000 DRTVWR-287 +0000000000000000000000000000000000000000 3.4.5-beta3 +0000000000000000000000000000000000000000 DRTVWR-289 +0000000000000000000000000000000000000000 DRTVWR-290 +0000000000000000000000000000000000000000 DRTVWR-291 +0000000000000000000000000000000000000000 DRTVWR-292 +0000000000000000000000000000000000000000 3.4.5-beta4 +0000000000000000000000000000000000000000 DRTVWR-296 +0000000000000000000000000000000000000000 DRTVWR-297 +0000000000000000000000000000000000000000 3.4.5-beta5 +0000000000000000000000000000000000000000 3.4.5-release +0000000000000000000000000000000000000000 DRTVWR-282 +0000000000000000000000000000000000000000 DRTVWR-284 +0000000000000000000000000000000000000000 CHUI-PV-0 +0000000000000000000000000000000000000000 DRTVWR-288 +0000000000000000000000000000000000000000 3.5.0-beta1 +0000000000000000000000000000000000000000 3.5.0-beta2 +0000000000000000000000000000000000000000 DRTVWR-302 +0000000000000000000000000000000000000000 3.5.0-beta3 +0000000000000000000000000000000000000000 DRTVWR-303 +0000000000000000000000000000000000000000 3.5.0-beta4 +0000000000000000000000000000000000000000 DRTVWR-304 +0000000000000000000000000000000000000000 3.5.0-beta5 +0000000000000000000000000000000000000000 DRTVWR-305 +0000000000000000000000000000000000000000 3.5.0-beta6 +0000000000000000000000000000000000000000 DRTVWR-306 +0000000000000000000000000000000000000000 3.5.0-beta7 +0000000000000000000000000000000000000000 3.5.0-release +0000000000000000000000000000000000000000 DRTVWR-310 +0000000000000000000000000000000000000000 3.5.1-beta1 +0000000000000000000000000000000000000000 DRTVWR-313 +0000000000000000000000000000000000000000 3.5.1-beta2 +0000000000000000000000000000000000000000 DRTVWR-314 +0000000000000000000000000000000000000000 3.5.1-beta3 +0000000000000000000000000000000000000000 3.5.1-release +0000000000000000000000000000000000000000 DRTVWR-298 +0000000000000000000000000000000000000000 DRTVWR-294 +0000000000000000000000000000000000000000 DRTVWR-309 +0000000000000000000000000000000000000000 DRTVWR-278 +0000000000000000000000000000000000000000 3.5.2-beta1 +0000000000000000000000000000000000000000 3.5.2-beta2 +0000000000000000000000000000000000000000 DRTVWR-316 +0000000000000000000000000000000000000000 DRTVWR-315 +0000000000000000000000000000000000000000 DRTVWR-299 +0000000000000000000000000000000000000000 3.5.2-beta3 +0000000000000000000000000000000000000000 3.5.2-beta4 +0000000000000000000000000000000000000000 MAINT-2647 +0000000000000000000000000000000000000000 3.5.2-beta5 +0000000000000000000000000000000000000000 3.5.2-beta6 +0000000000000000000000000000000000000000 3.5.2-release +0000000000000000000000000000000000000000 3.5.3-release +0000000000000000000000000000000000000000 3.6.0-materials-beta1 +0000000000000000000000000000000000000000 3.6.0-release +0000000000000000000000000000000000000000 3.6.1-release +0000000000000000000000000000000000000000 3.6.2-release +0000000000000000000000000000000000000000 3.6.3-release +0000000000000000000000000000000000000000 CHOP-951-a +0000000000000000000000000000000000000000 3.6.4-release +0000000000000000000000000000000000000000 3.6.5-release +0000000000000000000000000000000000000000 3.6.7-release +0000000000000000000000000000000000000000 3.6.8-release +0000000000000000000000000000000000000000 3.6.9-release +0000000000000000000000000000000000000000 3.6.10-release +0000000000000000000000000000000000000000 3.6.11-release +0000000000000000000000000000000000000000 3.6.12-release +0000000000000000000000000000000000000000 3.6.13-release +0000000000000000000000000000000000000000 3.7.0-release +0000000000000000000000000000000000000000 3.7.1-release +0000000000000000000000000000000000000000 3.7.2-release +0000000000000000000000000000000000000000 3.7.3-release +0000000000000000000000000000000000000000 3.7.4-release +0000000000000000000000000000000000000000 3.7.5-release +0000000000000000000000000000000000000000 3.7.6-release +0000000000000000000000000000000000000000 3.7.7-release +0000000000000000000000000000000000000000 3.7.8-release +0000000000000000000000000000000000000000 3.7.9-release +0000000000000000000000000000000000000000 3.7.10-release +0000000000000000000000000000000000000000 3.7.11-release +0000000000000000000000000000000000000000 3.7.12-release +0000000000000000000000000000000000000000 3.7.13-release +0000000000000000000000000000000000000000 3.7.14-release +0000000000000000000000000000000000000000 3.7.15-release +0000000000000000000000000000000000000000 3.7.16-release +0000000000000000000000000000000000000000 3.7.17-release +0000000000000000000000000000000000000000 3.7.18-release +0000000000000000000000000000000000000000 3.7.19-release +0000000000000000000000000000000000000000 3.7.20-release +0000000000000000000000000000000000000000 3.7.21-release +0000000000000000000000000000000000000000 3.7.22-release +0000000000000000000000000000000000000000 3.7.23-release +0000000000000000000000000000000000000000 3.7.24-release +0000000000000000000000000000000000000000 3.7.25-release +0000000000000000000000000000000000000000 3.7.26-release +0000000000000000000000000000000000000000 3.7.27-release +0000000000000000000000000000000000000000 3.7.28-release +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 +0a2ca6546b499239afeb66d17b2fadbcdbe36ab1 SL-3.4.3 +e1bb1ae7d8b12faeb37933a737c199cc9b9f89cc SL-3.4.4 +a49c715243a36a8a380504d14cb7416b3039c956 SL-3.4.5 +adc360e6bf21390d2665380951d85937cd29a604 SL-3.5.0 +13149a524874b608aeb76325b35faff113a5ea53 SL-3.5.1 +9b1b6f33aa5394b27bb652b31b5cb81ef6060370 SL-3.5.2 +a277b841729f2a62ba1e34acacc964bc13c1ad6f SL-3.5.3 +0a56f33ad6aa112032b14a41dad759ad377bdde9 SL-3.6.0 +75cf8e855ae1af6895a35da475314c2b5acf1850 SL-3.6.1 +f6741d5fe8d632651424484df0fe0cb4a01e9fbe SL-3.6.2 +fe4f7c5e9fd27e09d03deb1cc9ab3e5093f6309e SL-3.6.3 +91ed595b716f14f07409595b734fda891a59379e SL-3.6.4 +bf6d453046011a11de2643fac610cc5258650f82 SL-3.6.5 +b62e417982d9d4f3ec49d0de3b3c2e37c6d394c1 SL-3.6.6 +d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 SL-3.6.8 +70eda3721d36df3e00730629c42a1304e5bc65b8 SL-3.6.9 +5b54b36862ff8bc3b6935673c9d1c1f22ee8d521 SL-3.6.10 +2feb70a4cfde43f2898d95ff8fcae3e67805c7c2 SL-3.6.11 +88bbfd7a6971033f3aa103f3a3500ceb4c73521b SL-3.6.12 +0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 SL-3.6.13 +5d746de933a98ca17887cde2fece80e9c7ab0b98 SL-3.7.0 +dcb4981ce255841b6083d8f65444b65d5a733a17 SL-3.7.1 +b842534cb4d76c9ef87676a62b1d2d19e79c015f SL-3.7.2 +962d3f98955bfc7310a7867c8cbc3df075e54aa9 SL-3.7.3 +d076568ff7883b41c149e6afb421f39c29dbfe2b SL-3.7.4 +fc066b82343fca51f9c1b8eda0abc6bee9bb4503 SL-3.7.5 +d029faf69f20a23007f32420a1ac6a3b89a6d441 SL-3.7.6 +83959480cb986522d07b151a0c778ab7f920d41b SL-3.7.7 +bba9b3722eea08949e4ff69591f736bf0f808434 SL-3.7.8 +a9f2d0cb11f73b06858e6083bb50083becc3f9cd SL-3.7.9 +91dae9494b4d147541c7a01902334ba19a7ec05e SL-3.7.10 +64799eb298834073a3e9992cd8d27c3cb9d30b10 SL-3.7.11 +3b44ea8988cb902f0dda8429e8d5e4569e304532 SL-3.7.12 +d86a7e1bc96d27b683f951d3701d5b7042158c68 SL-3.7.13 +a7872554f3665588f1e8347d472cec3a299254b3 SL-3.7.14 +3f11f57f2b4d15a9f987d12bc70ef507eefb5018 SL-3.7.15 +562e7dace7465060ac9adb2e8eca800b699ff024 SL-3.7.16 +bcc2770e21c125e0bab59141c51db9145aec068d SL-3.7.17 +2729c1daf0257d68a40bdbc4acf1a16184974bbd SL-3.7.18 +82973b38a6c9a457333e3519e4f2b16bb5eedf47 SL-3.7.19 +27094824773b907c2e559396e6f9ec3a963de52d SL-3.7.20 +9ecab4b0c7d8614767724a3422d3c1dca6bd4e4f SL-3.7.21 +bc61801f614022c920cb5c3df1d7d67a9561ce1f SL-3.7.22 +3be800e1afad9615442159e388d6d137be7b951e SL-3.7.23 +d3d0101e980ec95043e0af9b7903045d3bc447e4 SL-3.7.24 +9978a8c3a2ffce4a5e1c186256581c2ac139c9dc SL-3.7.25 +000e9dda4162cbf0a83ba88558b19473654a09a9 SL-3.7.26 +afd8d4756e8eda3c8f760625d1c17a2ad40ad6c8 SL-3.7.27 +566874eb5ab26c003ef7fb0e22ce40c5fa0013f4 SL-3.7.28 +d07f76c5b9860fb87924d00ca729f7d4532534d6 SL-3.7.29 +67edc442c80b8d2fadd2a6c4a7184b469906cdbf SL-3.7.30 diff --git a/autobuild.xml b/autobuild.xml index 52d750f64d..042b0329e0 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -510,9 +510,9 @@ archive hash - 5aa7b826e7c1cf95e9cd3ef77e314f35 + 77c37ca8706f2c85084d317e10034acb url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/fmodex_3p-update-fmodex/rev/297261/arch/CYGWIN/installer/fmodex-4.44.31.297261-windows-297261.tar.bz2 + http://viewer.catznip.com/downloads/packages/fmodex-4.44.52-windows-20150506.tar.bz2 name windows @@ -2798,7 +2798,7 @@ -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON + -DUNATTENDED:BOOL=OFF -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -2884,7 +2884,7 @@ -G "Visual Studio 12" - -DUNATTENDED:BOOL=ON + -DUNATTENDED:BOOL=OFF -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 7a320ffc59..c28d3faedd 100755 --- 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 /Zo /MD /MP /Ob0 -D_SECURE_STL=0" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /Zo /MD /Gm /Ob0 -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 /Zo /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /Zo /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) # zlib has assembly-language object files incompatible with SAFESEH set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT") diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 25163d0322..2974af7e8e 100755 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,6 +3,7 @@ if (WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "$ENV{PROGRAMFILES}/Windows Kits/8.0/Include/um" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" @@ -26,6 +27,7 @@ if (WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "$ENV{PROGRAMFILES}/Windows Kits/8.0/Lib/Win8/um/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 13040ea423..1bf03915db 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1673,7 +1673,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" ) add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6dc71bc94e..34900f4794 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2197,7 +2197,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] } void LLAppViewer::initLoggingAndGetLastDuration()