diff --git a/.hgeol b/.hgeol new file mode 100644 index 0000000000..94205bd3ef --- /dev/null +++ b/.hgeol @@ -0,0 +1,12 @@ +[repository] +native = LF + +[patterns] +path:indra/lscript/lscript_compile/windows/unistd.h = CRLF +path:indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt = CRLF +path:indra/tools/vstool/README.txt = CRLF +**.h = native +**.cpp = native +**.py = native +**.xml = native +**.txt = native diff --git a/.hgpatchinfo/Viewer-Build.dep b/.hgpatchinfo/Viewer-Build.dep new file mode 100644 index 0000000000..6ef8d775bf --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.dep @@ -0,0 +1 @@ +43f5dc9c781eb7528a08abd58b2e4fea6ff1838e \ No newline at end of file diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc new file mode 100644 index 0000000000..6a503b7e35 --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.desc @@ -0,0 +1,10 @@ +[Viewer/Build] +* Changed compiler options for "Release with Debug" builds +* Changed compiler and linker options for "Release" builds +* Removed LL's changeset tags and added new (consistent) SL-X.Y.Z tags for releases +* Break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds + -> Windows only +* CATZ-234: Updated FMOD Ex library to v4.44.61 (Windows) +* CATZ-232: Updated OpenJPEG library to v1.5.2 (Windows) +* [FIXED] Viewer fails to compile with only the Windows 8 SDK installed +* [FIXED] JpegLib is built with "Whole Program Optimization" and causing slow linker performance diff --git a/.hgtags b/.hgtags index c9870bfb0f..b52b39ed32 100755 --- a/.hgtags +++ b/.hgtags @@ -521,3 +521,637 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release 45eaee56883df7a439ed3300c44d3126f7e3a41e 4.0.8-release b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-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 +0000000000000000000000000000000000000000 3.7.29-release +0000000000000000000000000000000000000000 3.7.30-release +0000000000000000000000000000000000000000 3.8.0-release +0000000000000000000000000000000000000000 3.8.1-release +0000000000000000000000000000000000000000 3.8.2-release +0000000000000000000000000000000000000000 3.8.2-release +0000000000000000000000000000000000000000 3.8.3-release +0000000000000000000000000000000000000000 3.8.4-release +0000000000000000000000000000000000000000 3.8.5-release +0000000000000000000000000000000000000000 3.8.6-release +0000000000000000000000000000000000000000 4.0.0-release +0000000000000000000000000000000000000000 4.0.1-release +0000000000000000000000000000000000000000 4.0.2-release +0000000000000000000000000000000000000000 4.0.3-release +0000000000000000000000000000000000000000 4.0.4-release +0000000000000000000000000000000000000000 4.0.5-release +0000000000000000000000000000000000000000 4.0.6-release +0000000000000000000000000000000000000000 4.0.7-release +0000000000000000000000000000000000000000 4.0.8-release +0000000000000000000000000000000000000000 4.1.1-release +0000000000000000000000000000000000000000 4.1.2-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 +797ed69e6134ef48bb922577ab2540fb2d964668 SL-3.8.0 +3f61ed662347dc7c6941b8266e72746a66d90e2a SL-3.8.1 +3a62616f3dd8bd512fcdfd29ef033b2505b11213 SL-3.8.2 +3a62616f3dd8bd512fcdfd29ef033b2505b11213 SL-3.8.2 +60572f718879f786f6bc8b5c9373ebebf4693078 SL-3.8.3 +27e3cf444c4cc645884960a61325a9ee0e9a2d0f SL-3.8.4 +e821ef17c6edea4a59997719d8ba416d8c16e143 SL-3.8.5 +5a5bd148943bfb46cf2ff2ccf376c42dee93d19b SL-3.8.6 +ae3297cdd03ab14f19f3811acbc4acd3eb600336 SL-4.0.0 +759710a9acef61aaf7b69f4bc4a5a913de87ad8a SL-4.0.1 +e9d350764dfbf5a46229e627547ef5c1b1eeef00 SL-4.0.2 +86dfba7ec4332c323025ebeacd8bf343ed0d8cfd SL-4.0.3 +0a5de9ec2cb868f367501024d8d6958c20869053 SL-4.0.4 +450de775fff66a011be1a001acd117cc623c445d SL-4.0.5 +4070611edd95eb3a683d1cd97c4c07fe67793812 SL-4.0.6 +33981d8130f031597b4c7f4c981b18359afb61a0 SL-4.0.7 +45eaee56883df7a439ed3300c44d3126f7e3a41e SL-4.0.8 +b280a1c797a3891e68dbc237e73de9cf19f426e9 SL-4.1.1 +bfbba2244320dc2ae47758cd7edd8fa3b67dc756 SL-4.1.2 diff --git a/autobuild.xml b/autobuild.xml index f485aa0cb7..e0efdcf8db 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -458,9 +458,9 @@ archive hash - 5aa7b826e7c1cf95e9cd3ef77e314f35 + b60d5d92be45b9d032fac377d3054821 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.61-windows-201602062026.tar.bz2 name windows @@ -1082,9 +1082,9 @@ archive hash - 98d3dc8d107d04b572fe47bd43a56e74 + 150ed9ecd913045551a287bd67ae1f8d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jpeglib_3p-update-jpeglib/rev/296854/arch/CYGWIN/installer/jpeglib-8c.296854-windows-296854.tar.bz2 + http://viewer.catznip.com/downloads/packages/jpeglib-8c.201512201541-windows.tar.bz2 name windows @@ -1848,9 +1848,9 @@ archive hash - b35adcf74d22c128045aa87aade74736 + fa394ec294b1ec7fefdd7e87a9f09bd0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openjpeg_3p-update-openjpeg/rev/297018/arch/CYGWIN/installer/openjpeg-1.4.297018-windows-297018.tar.bz2 + http://viewer.catznip.com/downloads/packages/openjpeg-1.5.2.201602060245-windows.tar.bz2 name windows diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index adc134c48c..5e75fc8215 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -52,7 +52,7 @@ if (WINDOWS) "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /Zo /MD /MP /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..083a5a3b03 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -1,19 +1,12 @@ # -*- cmake -*- if (WINDOWS) - find_path(DIRECTX_INCLUDE_DIR dxdiag.h - "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Include" - "C:/DX90SDK/Include" - "$ENV{PROGRAMFILES}/DX90SDK/Include" - ) + include(FindWindowsSDK) + + get_windowssdk_include_dirs(${WINDOWSSDK_PREFERRED_DIR} WINDOWSSDK_INCLUDE_DIRS) + find_path(DIRECTX_INCLUDE_DIR + NAMES dxdiag.h + PATHS ${WINDOWSSDK_INCLUDE_DIRS}) if (DIRECTX_INCLUDE_DIR) include_directories(${DIRECTX_INCLUDE_DIR}) if (DIRECTX_FIND_QUIETLY) @@ -24,19 +17,10 @@ if (WINDOWS) endif (DIRECTX_INCLUDE_DIR) - find_path(DIRECTX_LIBRARY_DIR dxguid.lib - "$ENV{DXSDK_DIR}/Lib/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" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Lib/x86" - "C:/DX90SDK/Lib" - "$ENV{PROGRAMFILES}/DX90SDK/Lib" - ) + get_windowssdk_library_dirs(${WINDOWSSDK_PREFERRED_DIR} WINDOWSSDK_LIBRARY_DIRS) + find_path(DIRECTX_LIBRARY_DIR + NAMES dxguid.lib + PATHS ${WINDOWSSDK_LIBRARY_DIRS}) if (DIRECTX_LIBRARY_DIR) if (DIRECTX_FIND_QUIETLY) message(STATUS "Found DirectX include: ${DIRECTX_LIBRARY_DIR}") diff --git a/indra/cmake/FindWindowsSDK.cmake b/indra/cmake/FindWindowsSDK.cmake new file mode 100644 index 0000000000..a0f4b4d328 --- /dev/null +++ b/indra/cmake/FindWindowsSDK.cmake @@ -0,0 +1,322 @@ +# - Find the Windows SDK aka Platform SDK +# +# Relevant Wikipedia article: http://en.wikipedia.org/wiki/Microsoft_Windows_SDK +# +# Variables: +# WINDOWSSDK_FOUND - if any version of the windows or platform SDK was found that is usable with the current version of visual studio +# WINDOWSSDK_LATEST_DIR +# WINDOWSSDK_LATEST_NAME +# WINDOWSSDK_FOUND_PREFERENCE - if we found an entry indicating a "preferred" SDK listed for this visual studio version +# WINDOWSSDK_PREFERRED_DIR +# WINDOWSSDK_PREFERRED_NAME +# +# WINDOWSSDK_DIRS - contains no duplicates, ordered most recent first. +# WINDOWSSDK_PREFERRED_FIRST_DIRS - contains no duplicates, ordered with preferred first, followed by the rest in descending recency +# +# Functions: +# windowssdk_name_lookup( ) - Find the name corresponding with the SDK directory you pass in, or +# NOTFOUND if not recognized. Your directory must be one of WINDOWSSDK_DIRS for this to work. +# +# get_windowssdk_from_component( ) - Given a library or include dir, +# find the Windows SDK root dir corresponding to it, or NOTFOUND if unrecognized. +# +# get_windowssdk_library_dirs( ) - Find the architecture-appropriate +# library directories corresponding to the SDK directory you pass in (or NOTFOUND if none) +# +# get_windowssdk_include_dirs( ) - Find the +# include directories corresponding to the SDK directory you pass in (or NOTFOUND if none) +# +# Requires these CMake modules: +# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) +# +# Original Author: +# 2012 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2012. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +set(_preferred_sdk_dirs) +set(_win_sdk_dirs) +set(_win_sdk_versanddirs) +if(MSVC_VERSION GREATER 1310) # Newer than VS .NET/VS Toolkit 2003 + + # Environment variable for SDK dir + if(EXISTS "$ENV{WindowsSDKDir}" AND (NOT "$ENV{WindowsSDKDir}" STREQUAL "")) + message(STATUS "Got $ENV{WindowsSDKDir} - Windows/Platform SDK directories: ${_win_sdk_dirs}") + list(APPEND _preferred_sdk_dirs "$ENV{WindowsSDKDir}") + endif() + + if(MSVC_VERSION LESS 1600) + # Per-user current Windows SDK for VS2005/2008 + get_filename_component(_sdkdir + "[HKEY_CURRENT_USER\\Software\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" + ABSOLUTE) + if(EXISTS "${_sdkdir}") + list(APPEND _preferred_sdk_dirs "${_sdkdir}") + endif() + + # System-wide current Windows SDK for VS2005/2008 + get_filename_component(_sdkdir + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" + ABSOLUTE) + if(EXISTS "${_sdkdir}") + list(APPEND _preferred_sdk_dirs "${_sdkdir}") + endif() + endif() + + if(MSVC_VERSION LESS 1700) + # VC 10 and older has broad target support + set(_winsdk_vistaonly) + else() + # VC 11 by default targets Vista and later only, so we can add a few more SDKs that (might?) only work on vista+ + if("${CMAKE_VS_PLATFORM_TOOLSET}" MATCHES "_xp") + # This is the XP-compatible v110 toolset + elseif("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v100") + # This is the VS2010 toolset + else() + #if(NOT WINDOWSSDK_FOUND AND NOT WindowsSDK_FIND_QUIETLY) + # message(STATUS "FindWindowsSDK: Detected Visual Studio 2012 or newer, not using the _xp toolset variant: including SDK versions that drop XP support in search!") + #endif() + # These versions have no XP (and possibly Vista pre-SP1) support + set(_winsdk_vistaonly) + if(NOT MSVC_VERSION LESS 1800) + list(APPEND _winsdk_vistaonly + # Windows Software Development Kit (SDK) for Windows 8.1 + # http://msdn.microsoft.com/en-gb/windows/desktop/bg162891 + v8.1) + endif() + list(APPEND _winsdk_vistaonly + # Included in Visual Studio 2012 + v8.0A + + # Microsoft Windows SDK for Windows 8 and .NET Framework 4.5 + # This is the first version to also include the DirectX SDK + # http://msdn.microsoft.com/en-US/windows/desktop/hh852363.aspx + v8.0 + + # Microsoft Windows SDK for Windows 7 and .NET Framework 4 + # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=6b6c21d2-2006-4afa-9702-529fa782d63b + v7.1 + ) + endif() + endif() + foreach(_winsdkver + ${_winsdk_vistaonly} + + # Included in Visual Studio 2013 + # Includes the v120_xp toolset + v8.1A + + # Included with VS 2012 Update 1 or later + # Introduces v110_xp toolset + v7.1A + + # Included with VS 2010 + v7.0A + + # Windows SDK for Windows 7 and .NET Framework 3.5 SP1 + # Works with VC9 + #http://www.microsoft.com/en-us/download/details.aspx?id=18950 + v7.0 + + # Two versions call themselves "v6.1": + # Older: + # Windows Vista Update & .NET 3.0 SDK + # http://www.microsoft.com/en-us/download/details.aspx?id=14477 + + # Newer: + # Windows Server 2008 & .NET 3.5 SDK + # may have broken VS9SP1? they recommend v7.0 instead, or a KB... + # http://www.microsoft.com/en-us/download/details.aspx?id=24826 + v6.1 + + # Included in VS 2008 + v6.0A + + # Microsoft Windows Software Development Kit for Windows Vista and .NET Framework 3.0 Runtime Components + # http://blogs.msdn.com/b/stanley/archive/2006/11/08/microsoft-windows-software-development-kit-for-windows-vista-and-net-framework-3-0-runtime-components.aspx + v6.0) + + get_filename_component(_sdkdir + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\${_winsdkver};InstallationFolder]" + ABSOLUTE) + if(EXISTS "${_sdkdir}") + list(APPEND _win_sdk_dirs "${_sdkdir}") + list(APPEND + _win_sdk_versanddirs + "Windows SDK ${_winsdkver}" + "${_sdkdir}") + endif() + endforeach() +endif() +if(MSVC_VERSION GREATER 1200) + foreach(_platformsdkinfo + "D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1_Microsoft Platform SDK for Windows Server 2003 R2" + "8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3_Microsoft Platform SDK for Windows Server 2003 SP1") + string(SUBSTRING "${_platformsdkinfo}" 0 36 _platformsdkguid) + string(SUBSTRING "${_platformsdkinfo}" 37 -1 _platformsdkname) + foreach(HIVE HKEY_LOCAL_MACHINE HKEY_CURRENT_USER) + get_filename_component(_sdkdir + "[${HIVE}\\SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\${_platformsdkguid};Install Dir]" + ABSOLUTE) + if(EXISTS "${_sdkdir}") + list(APPEND _win_sdk_dirs "${_sdkdir}") + list(APPEND _win_sdk_versanddirs "${_platformsdkname}" "${_sdkdir}") + endif() + endforeach() + endforeach() +endif() + +set(_win_sdk_versanddirs + "${_win_sdk_versanddirs}" + CACHE + INTERNAL + "mapping between windows sdk version locations and names" + FORCE) + +function(windowssdk_name_lookup _dir _outvar) + list(FIND _win_sdk_versanddirs "${_dir}" _diridx) + math(EXPR _nameidx "${_diridx} - 1") + if(${_nameidx} GREATER -1) + list(GET _win_sdk_versanddirs ${_nameidx} _sdkname) + else() + set(_sdkname "NOTFOUND") + endif() + set(${_outvar} "${_sdkname}" PARENT_SCOPE) +endfunction() + +if(_win_sdk_dirs) + # Remove duplicates + list(REMOVE_DUPLICATES _win_sdk_dirs) + list(GET _win_sdk_dirs 0 WINDOWSSDK_LATEST_DIR) + windowssdk_name_lookup("${WINDOWSSDK_LATEST_DIR}" + WINDOWSSDK_LATEST_NAME) + set(WINDOWSSDK_DIRS ${_win_sdk_dirs}) +endif() +if(_preferred_sdk_dirs) + list(GET _preferred_sdk_dirs 0 WINDOWSSDK_PREFERRED_DIR) + windowssdk_name_lookup("${WINDOWSSDK_LATEST_DIR}" + WINDOWSSDK_PREFERRED_NAME) + set(WINDOWSSDK_PREFERRED_FIRST_DIRS + ${_preferred_sdk_dirs} + ${_win_sdk_dirs}) + list(REMOVE_DUPLICATES WINDOWSSDK_PREFERRED_FIRST_DIRS) + set(WINDOWSSDK_FOUND_PREFERENCE ON) + + # In case a preferred dir was found that isn't found otherwise + #set(WINDOWSSDK_DIRS ${WINDOWSSDK_DIRS} ${WINDOWSSDK_PREFERRED_FIRST_DIRS}) + #list(REMOVE_DUPLICATES WINDOWSSDK_DIRS) +else() + set(WINDOWSSDK_PREFERRED_DIR "${WINDOWSSDK_LATEST_DIR}") + set(WINDOWSSDK_PREFERRED_NAME "${WINDOWSSDK_LATEST_NAME}") + set(WINDOWSSDK_PREFERRED_FIRST_DIRS ${WINDOWSSDK_DIRS}) + set(WINDOWSSDK_FOUND_PREFERENCE OFF) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(WindowsSDK + "No compatible version of the Windows SDK or Platform SDK found." + WINDOWSSDK_DIRS) + +if(WINDOWSSDK_FOUND) + if(NOT _winsdk_remembered_dirs STREQUAL WINDOWSSDK_DIRS) + set(_winsdk_remembered_dirs + "${WINDOWSSDK_DIRS}" + CACHE + INTERNAL + "" + FORCE) + if(NOT WindowsSDK_FIND_QUIETLY) + foreach(_sdkdir ${WINDOWSSDK_DIRS}) + windowssdk_name_lookup("${_sdkdir}" _sdkname) + message(STATUS " - Found ${_sdkname} at ${_sdkdir}") + endforeach() + endif() + endif() + + # Internal: Architecture-appropriate library directory names. + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "ARM") + set(_winsdk_archbare /arm) # what the architecture used to be called in oldest SDKs + set(_winsdk_arch arm) # what the architecture used to be called + set(_winsdk_arch8 arm) # what the WDK for Win8+ calls this architecture + else() + if(CMAKE_SIZEOF_VOID_P MATCHES "8") + set(_winsdk_archbare /x64) # what the architecture used to be called in oldest SDKs + set(_winsdk_arch amd64) # what the architecture used to be called + set(_winsdk_arch8 x64) # what the WDK for Win8+ calls this architecture + else() + set(_winsdk_archbare ) # what the architecture used to be called in oldest SDKs + set(_winsdk_arch i386) # what the architecture used to be called + set(_winsdk_arch8 x86) # what the WDK for Win8+ calls this architecture + endif() + endif() + + function(get_windowssdk_from_component _component _var) + get_filename_component(_component "${_component}" ABSOLUTE) + file(TO_CMAKE_PATH "${_component}" _component) + foreach(_sdkdir ${WINDOWSSDK_DIRS}) + get_filename_component(_sdkdir "${_sdkdir}" ABSOLUTE) + string(LENGTH "${_sdkdir}" _sdklen) + file(RELATIVE_PATH _rel "${_sdkdir}" "${_component}") + # If we don't have any "parent directory" items... + if(NOT "${_rel}" MATCHES "[.][.]") + set(${_var} "${_sdkdir}" PARENT_SCOPE) + return() + endif() + endforeach() + # Fail. + set(${_var} "NOTFOUND" PARENT_SCOPE) + endfunction() + function(get_windowssdk_library_dirs _winsdk_dir _var) + set(_result) + foreach(_suffix + "lib${_winsdk_archbare}" # SDKs like 7.1A + "lib/w2k/${_winsdk_arch}" # Win2k min requirement + "lib/wxp/${_winsdk_arch}" # WinXP min requirement + "lib/wnet/${_winsdk_arch}" # Win Server 2003 min requirement + "lib/wlh/${_winsdk_arch}" # Win Vista ("Long Horn") min requirement + "lib/wlh/um/${_winsdk_arch8}" # Win Vista ("Long Horn") min requirement + "lib/win7/${_winsdk_arch}" # Win 7 min requirement + "lib/win7/um/${_winsdk_arch8}" # Win 7 min requirement + "lib/win8/um/${_winsdk_arch8}" # Win 8 min requirement + "lib/win8/km/${_winsdk_arch8}" # Win 8 min requirement + "lib/winv6.3/km/${_winsdk_arch8}" # Win 8.1 min requirement + "lib/winv6.3/um/${_winsdk_arch8}" # Win 8.1 min requirement + ) + # Check to see if a library actually exists here. + file(GLOB _libs "${_winsdk_dir}/${_suffix}/*.lib") + if(_libs) + list(APPEND _result "${_winsdk_dir}/${_suffix}") + endif() + endforeach() + if(NOT _result) + set(_result NOTFOUND) + endif() + set(${_var} ${_result} PARENT_SCOPE) + endfunction() + function(get_windowssdk_include_dirs _winsdk_dir _var) + set(_result) + foreach(_suffix + "Include" + "Include/shared" + "Include/um" + "Include/winrt" + "Include/km" + "Include/wdf" + ) + # Check to see if a header file actually exists here. + file(GLOB _headers "${_winsdk_dir}/${_suffix}/*.h") + if(_headers) + list(APPEND _result "${_winsdk_dir}/${_suffix}") + endif() + endforeach() + if(NOT _result) + set(_result NOTFOUND) + endif() + set(${_var} ${_result} PARENT_SCOPE) + endfunction() +endif() diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 3bb1778d9d..3a7f70355a 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -41,8 +41,11 @@ LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl() std::string LLImageJ2COJ::getEngineInfo() const { - return std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ") - + opj_version(); +// [SL:KB] - Patch: Viewer-Build | Checked: 2016-02-07 (Catznip-4.0) + return std::string("OpenJPEG: ") + opj_version(); +// [/SL:KB] +// return std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ") +// + opj_version(); } // Return string from message, eliminating final \n if present diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 16edd39ecc..c96cac8e7c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1682,7 +1682,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) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9db03a7438..96da329fa9 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2168,7 +2168,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()