diff --git a/.hgpatchinfo/Viewer-Build.dep b/.hgpatchinfo/Viewer-Build.dep new file mode 100644 index 0000000000..b81ad65a47 --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.dep @@ -0,0 +1 @@ +d8c37b383028e092a6a365af730372a3ac0f5f7f \ No newline at end of file diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc new file mode 100644 index 0000000000..6226253885 --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.desc @@ -0,0 +1,7 @@ +[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-2.X.Y 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 +- fixed : *OS builds don't set the default Visual Studio project and configuration diff --git a/.hgtags b/.hgtags index e050331fdf..5705fd4396 100644 --- a/.hgtags +++ b/.hgtags @@ -151,3 +151,168 @@ e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start 502f6a5deca9365ddae57db4f1e30172668e171e 2.8.1-start e1ed60913230dd64269a7f7fc52cbc6004f6d52c DRTVWR-71_2.8.0-beta1 e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-beta1 +0000000000000000000000000000000000000000 2.1.1-release +0000000000000000000000000000000000000000 v2start +0000000000000000000000000000000000000000 2-1rn1 +0000000000000000000000000000000000000000 2-1-beta-2 +0000000000000000000000000000000000000000 beta-5 +0000000000000000000000000000000000000000 beta-3-5 +0000000000000000000000000000000000000000 2-1-1-beta-1 +0000000000000000000000000000000000000000 2-1-beta-3 +0000000000000000000000000000000000000000 beta-4 +0000000000000000000000000000000000000000 2-1-beta-1 +0000000000000000000000000000000000000000 2-1-1-beta-2 +0000000000000000000000000000000000000000 viewer-2-1-0-start +0000000000000000000000000000000000000000 viewer-2-0-0 +0000000000000000000000000000000000000000 alpha-3 +0000000000000000000000000000000000000000 viewer-2-0-1 +0000000000000000000000000000000000000000 2-1-1-beta-2 +0000000000000000000000000000000000000000 alpha-4 +0000000000000000000000000000000000000000 fork to viewer-20qa +0000000000000000000000000000000000000000 viewer-2-0-2-start +0000000000000000000000000000000000000000 2-1-1-release +0000000000000000000000000000000000000000 2-1-release +0000000000000000000000000000000000000000 alpha-6 +0000000000000000000000000000000000000000 2-1-1-release +0000000000000000000000000000000000000000 2-1-beta-4 +0000000000000000000000000000000000000000 howard-demo +0000000000000000000000000000000000000000 alpha-5 +0000000000000000000000000000000000000000 fork to viewer-2-0 +0000000000000000000000000000000000000000 last_sprint +0000000000000000000000000000000000000000 beta_2.1.3 +0000000000000000000000000000000000000000 2.2.0-beta1 +0000000000000000000000000000000000000000 2.2.0-beta2 +0000000000000000000000000000000000000000 2.2.0-beta3 +0000000000000000000000000000000000000000 2.2.0-beta4 +0000000000000000000000000000000000000000 2.3.0-beta1 +0000000000000000000000000000000000000000 2.2.0-release +0000000000000000000000000000000000000000 2.3.0-start +0000000000000000000000000000000000000000 2.3.0-beta1 +0000000000000000000000000000000000000000 2.3.0-beta2 +0000000000000000000000000000000000000000 2.3.0-beta3 +0000000000000000000000000000000000000000 2.3.0-release +0000000000000000000000000000000000000000 2.4.0-start +0000000000000000000000000000000000000000 2.4.0-beta1 +0000000000000000000000000000000000000000 2.4.0-beta1 +0000000000000000000000000000000000000000 2.4.0-beta1 +0000000000000000000000000000000000000000 2.4.0-beta2 +0000000000000000000000000000000000000000 2.4.0-release +0000000000000000000000000000000000000000 2.5.0-start +0000000000000000000000000000000000000000 2.5.0-beta1 +0000000000000000000000000000000000000000 76f586a8e22b +0000000000000000000000000000000000000000 2.5.0-beta2 +0000000000000000000000000000000000000000 nat-eventapi2-base +0000000000000000000000000000000000000000 DRTVWR-5_2.2.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-3_2.2.0-beta2 +0000000000000000000000000000000000000000 DRTVWR-7_2.2.0-beta3 +0000000000000000000000000000000000000000 DRTVWR-8_2.2.0-release +0000000000000000000000000000000000000000 DRTVWR-14_2.3.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-17_2.3.0-beta2 +0000000000000000000000000000000000000000 DRTVWR-20_2.3.0-beta3 +0000000000000000000000000000000000000000 DRTVWR-13_2.3.0-release +0000000000000000000000000000000000000000 DRTVWR-26_2.4.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-27_2.4.0-beta2 +0000000000000000000000000000000000000000 DRTVWR-25_2.4.0-release +0000000000000000000000000000000000000000 DRTVWR-32_2.5.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-33_2.5.0-beta2 +0000000000000000000000000000000000000000 2.5.0-beta3 +0000000000000000000000000000000000000000 DRTVWR-34_2.5.0-beta3 +0000000000000000000000000000000000000000 2.5.0-release +0000000000000000000000000000000000000000 DRTVWR-31_2.5.0-release +0000000000000000000000000000000000000000 dons-headless-hackathon-work +0000000000000000000000000000000000000000 2.5.1-start +0000000000000000000000000000000000000000 2.5.1-release +0000000000000000000000000000000000000000 DRTVWR-37_2.5.1-release +0000000000000000000000000000000000000000 DRTVWR-38_2.5.2-release +0000000000000000000000000000000000000000 2.5.2-release +0000000000000000000000000000000000000000 2.6.0-start +0000000000000000000000000000000000000000 2.6.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-40_2.6.0-beta1 +0000000000000000000000000000000000000000 DRTVWR-41_2.6.0-beta2 +0000000000000000000000000000000000000000 2.6.0-beta2 +0000000000000000000000000000000000000000 2.6.1-start +0000000000000000000000000000000000000000 DRTVWR-43_2.6.1-beta1 +0000000000000000000000000000000000000000 2.6.1-beta1 +0000000000000000000000000000000000000000 DRTVWR-42_2.6.1-release +0000000000000000000000000000000000000000 2.6.1-release +0000000000000000000000000000000000000000 2.6.2-start +0000000000000000000000000000000000000000 DRTVWR-39_2.6.0-release +0000000000000000000000000000000000000000 2.6.0-release +0000000000000000000000000000000000000000 DRTVWR-45_2.6.2-beta1 +0000000000000000000000000000000000000000 2.6.2-beta1 +0000000000000000000000000000000000000000 DRTVWR-44_2.6.2-release +0000000000000000000000000000000000000000 2.6.2-release +0000000000000000000000000000000000000000 end-of-develop.py +0000000000000000000000000000000000000000 2.6.3-start +0000000000000000000000000000000000000000 DRTVWR-47_2.6.3-beta1 +0000000000000000000000000000000000000000 2.6.3-beta1 +0000000000000000000000000000000000000000 DRTVWR-48_2.6.3-beta2 +0000000000000000000000000000000000000000 2.6.3-beta2 +0000000000000000000000000000000000000000 DRTVWR-50_2.6.5-beta1 +0000000000000000000000000000000000000000 2.6.5-beta1 +0000000000000000000000000000000000000000 2.6.6-start +0000000000000000000000000000000000000000 DRTVWR-52_2.6.6-beta1 +0000000000000000000000000000000000000000 2.6.6-beta1 +0000000000000000000000000000000000000000 2.6.8-start +0000000000000000000000000000000000000000 DRTVWR-55_2.6.8-beta1 +0000000000000000000000000000000000000000 2.6.8-beta1 +0000000000000000000000000000000000000000 2.6.9-start +0000000000000000000000000000000000000000 2.6.9-start +0000000000000000000000000000000000000000 DRTVWR-57_2.6.9-beta1 +0000000000000000000000000000000000000000 2.6.9-beta1 +0000000000000000000000000000000000000000 DRTVWR-54_2.6.8-release +0000000000000000000000000000000000000000 2.6.8-release +0000000000000000000000000000000000000000 DRTVWR-51_2.6.6-release +0000000000000000000000000000000000000000 2.6.6-release +0000000000000000000000000000000000000000 DRTVWR-46_2.6.3-release +0000000000000000000000000000000000000000 2.6.3-release +0000000000000000000000000000000000000000 DRTVWR-56_2.6.9-release +0000000000000000000000000000000000000000 2.6.9-release +0000000000000000000000000000000000000000 2.7.0-start +0000000000000000000000000000000000000000 DRTVWR-59_2.7.0-beta1 +0000000000000000000000000000000000000000 2.7.0-beta1 +0000000000000000000000000000000000000000 2.7.1-start +0000000000000000000000000000000000000000 DRTVWR-61_2.7.1-beta1 +0000000000000000000000000000000000000000 2.7.1-beta1 +0000000000000000000000000000000000000000 DRTVWR-60_2.7.1-release +0000000000000000000000000000000000000000 2.7.1-release +0000000000000000000000000000000000000000 2.7.2-start +0000000000000000000000000000000000000000 DRTVWR-63_2.7.2-beta1 +0000000000000000000000000000000000000000 2.7.2-beta1 +0000000000000000000000000000000000000000 2.7.3-start +0000000000000000000000000000000000000000 2.7.4-start +0000000000000000000000000000000000000000 DRTVWR-67_2.7.4-beta1 +0000000000000000000000000000000000000000 2.7.4-beta1 +0000000000000000000000000000000000000000 DRTVWR-66_2.7.4-release +0000000000000000000000000000000000000000 2.7.4-release +0000000000000000000000000000000000000000 DRTVWR-60_2.7.1-release +0000000000000000000000000000000000000000 DRTVWR-67_2.7.4-beta1 +0000000000000000000000000000000000000000 2.7.4-beta1 +0000000000000000000000000000000000000000 2.7.1-release +0000000000000000000000000000000000000000 2.7.5-start +0000000000000000000000000000000000000000 DRTVWR-69_2.7.5-beta1 +0000000000000000000000000000000000000000 2.7.5-beta1 +0000000000000000000000000000000000000000 2.8.0-start +0000000000000000000000000000000000000000 2.8.1-start +0000000000000000000000000000000000000000 DRTVWR-71_2.8.0-beta1 +0000000000000000000000000000000000000000 2.8.0-beta1 +4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0 +668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1 +b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0 +bb38ff1a763738609e1b3cada6d15fa61e5e84b9 SL-2.1.1 +1415e6538d54fd5d568ee88343424d57c6803c2c SL-2.2.0 +6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 SL-2.3.0 +1ed382c6a08ba3850b6ce9061bc551ddece0ea07 SL-2.4.0 +b723921b5c711bd24dbe77dc76ef488b544dac78 SL-2.5.0 +4dede9ae1ec74d41f6887719f6f1de7340d8578d SL-2.5.1 +b53a0576eec80614d7767ed72b40ed67aeff27c9 SL-2.5.2 +42f32494bac475d0737799346f6831558ae8bf5d SL-2.6.0 +c9182ed77d427c759cfacf49a7b71a2e20d522aa SL-2.6.1 +214180ad5714ce8392b82bbebcc92f4babd98300 SL-2.6.2 +8f2da1701c81a62352df2b8d413d27fb2cade9a6 SL-2.6.3 +dac76a711da5f1489a01c1fa62ec97d99c25736d SL-2.6.6 +be2000b946f8cb3de5f44b2d419287d4c48ec4eb SL-2.6.8 +77e5a08344c95738ab879f9671b7758cddd712a3 SL-2.6.9 +a9abb9633a266c8d2fe62411cfd1c86d32da72bf SL-2.7.1 +057f319dd8eccdf63a54d99686c68cdcb31b6abc SL-2.7.4 + diff --git a/autobuild.xml b/autobuild.xml index d381035248..b016c62d1c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1038,9 +1038,9 @@ archive hash - f194ba857ca8dd86483a3ef24535d0db + 73a1892bcbaaecdf369a7884efb46049 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/226532/arch/CYGWIN/installer/libpng-1.5.1-windows-20110413.tar.bz2 + http://viewer.catznip.com/downloads/libpng-1.5.1-windows-20110619.tar.bz2 name windows @@ -2303,6 +2303,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Debug + --startup + secondlife-bin + options -G @@ -2379,6 +2391,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + options -G @@ -2455,6 +2479,18 @@ configure + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin + options -G diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 0266239454..57da2a0723 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -46,10 +46,10 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Ob2 /Gm -D_SECURE_STL=0" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 /Oi /Ot /GF /Gy /arch:SSE2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "") diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 935dd2e887..c01a9b9c1d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1484,7 +1484,7 @@ if (WINDOWS) #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE "" + LINK_FLAGS_RELEASE "/OPT:REF" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 862fc49c0e..1470be7a98 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1917,7 +1917,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.6.0a) | Added: Catznip-2.4.0g +#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS + DebugBreak(); +#else LLError::crashAndLoop(error_string); +#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS +// [/SL:KB] } bool LLAppViewer::initLogging()