From c1d74e58abf75cecb5bb42d80277524166662746 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 22 Aug 2010 03:04:14 +0200 Subject: [PATCH 01/15] [Viewer/Build] --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.dep | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgpatchinfo/Viewer-Build.dep diff --git a/.hgpatchinfo/Viewer-Build.dep b/.hgpatchinfo/Viewer-Build.dep new file mode 100644 index 0000000000..09657997e6 --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.dep @@ -0,0 +1 @@ +685e6455117770dc85f7ac01b9b76d7242d5f7dd \ No newline at end of file From 3ee498c4ed75d4dafc849aeb9dd3ef14f2385ef4 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 22 Aug 2010 05:48:00 +0200 Subject: [PATCH 02/15] [Viewer/Build] - changed: compiler options for "Release with Debug" builds - changed: compiler and linker options for "Release" builds --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.desc | 3 +++ indra/cmake/00-Common.cmake | 4 ++-- indra/newview/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .hgpatchinfo/Viewer-Build.desc diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc new file mode 100644 index 0000000000..949cbb49bf --- /dev/null +++ b/.hgpatchinfo/Viewer-Build.desc @@ -0,0 +1,3 @@ +[Viewer/Build] +- changed: compiler options for "Release with Debug" builds +- changed: compiler and linker options for "Release" builds diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index a114d6e778..2dd65e247d 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -38,10 +38,10 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Gm" 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" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /Oi /Ot /GF /Gy /arch:SSE2" 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 1ee7586d5f..bfb1674b8a 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1410,7 +1410,7 @@ if (WINDOWS) if(MSVC71) set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES") else(MSVC71) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") + set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /OPT:REF") endif(MSVC71) set_target_properties(${VIEWER_BINARY_NAME} From 5452360c21c19d72f9ab9441afb4f99b56bd3df3 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 22 Aug 2010 05:57:21 +0200 Subject: [PATCH 03/15] [Viewer/Build] - added: imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions --HG-- branch : Viewer-Build --- indra/cmake/00-Common.cmake | 14 ++++++++++++ indra/cmake/Boost.cmake | 45 ++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2dd65e247d..8ba2d92b3e 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -78,6 +78,20 @@ if (WINDOWS) # configure win32 API for windows XP+ compatibility set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)") add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}") + + # Various libs are compiler specific, generate some variables here we can just use + # when we require them instead of reimplementing the test each time. + if (MSVC71) + set(MSVC_DIR 7.1) + set(MSVC_SUFFIX 71) + elseif (MSVC80) + set(MSVC_DIR 8.0) + set(MSVC_SUFFIX 80) + elseif (MSVC90) + set(MSVC_DIR 9.0) + set(MSVC_SUFFIX 90) + endif (MSVC71) + endif (WINDOWS) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 7ce57a5572..dcbc801663 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -16,27 +16,30 @@ else (STANDALONE) if (WINDOWS) set(BOOST_VERSION 1_39) - if (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION} - debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc71-mt-s-${BOOST_VERSION} - debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc71-mt-s-${BOOST_VERSION} - debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION}) - else (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc80-mt-${BOOST_VERSION} - debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc80-mt-${BOOST_VERSION} - debug libboost_regex-vc80-mt-gd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc80-mt-${BOOST_VERSION} - debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) - endif (MSVC71) + + # SNOW-788 + # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc + # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90 + # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate + # boost libs are avaiable - RC. + + if (MSVC71) + set(BOOST_OPTIM_SUFFIX mt-s) + set(BOOST_DEBUG_SUFFIX mt-sgd) + else (MSVC71) + set(BOOST_OPTIM_SUFFIX mt) + set(BOOST_DEBUG_SUFFIX mt-gd) + endif (MSVC71) + + set(BOOST_PROGRAM_OPTIONS_LIBRARY + optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} + debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) + set(BOOST_REGEX_LIBRARY + optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} + debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) + set(BOOST_SIGNALS_LIBRARY + optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} + debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) From ea51bc9a5634264d691dd6ecb7d975244e847527 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 1 Sep 2010 23:11:31 +0200 Subject: [PATCH 04/15] Removed LL's changeset tags --HG-- branch : Viewer-Build --- .hgtags | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.hgtags b/.hgtags index d3172eb75a..25009d7d58 100644 --- a/.hgtags +++ b/.hgtags @@ -8,17 +8,45 @@ 3469d90a115b900f8f250e137bbd9b684130f5d2 beta-4 3e4b947f79d88c385e8218cbc0731cef0e42cfc4 2-1-beta-1 46002088d9a4489e323b8d56131c680eaa21258c viewer-2-1-0-start +4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0 4f777ffb99fefdc6497c61385c22688ff149c659 viewer-2-0-0 52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3 668851b2ef0f8cf8df07a0fba429e4a6c1e70abb viewer-2-0-1 +668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1 6e3b2e13906ba8ff22d3c8490b02d518adb2c907 2-1-1-beta-2 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f alpha-4 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f fork to viewer-20qa 80bc6cff515118a36108967af49d3f8105c95bc9 viewer-2-0-2-start b03065d018b8a2e28b7de85b293a4c992cb4c12d 2-1-release +b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0 b8419565906e4feb434426d8d9b17dd1458e24b2 alpha-6 bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2-1-1-release +bb38ff1a763738609e1b3cada6d15fa61e5e84b9 SL-2.1.1 c6969fe44e58c542bfc6f1bd6c0be2fa860929ac 2-1-beta-4 d2382d374139850efa5bb6adfb229e3e656cfc40 howard-demo d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5 d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0 +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 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-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 From 53ee8bddffa50344400b556c63a2c11142e9525d Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 22 Oct 2010 23:34:47 +0200 Subject: [PATCH 05/15] - imported : [STORM-406] develop.py fails due to FMOD -> patch by Boroondas Gupte and Merov Linden --HG-- branch : Viewer-Build --- doc/contributions.txt | 1 + indra/cmake/FMOD.cmake | 6 ++++-- indra/llaudio/CMakeLists.txt | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 16327d0917..3502f4f8b9 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -174,6 +174,7 @@ Boroondas Gupte VWR-233 VWR-20583 VWR-20891 + VWR-23455 WEB-262 Bulli Schumann CT-218 diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 96434e38fa..dcf44cd642 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -7,8 +7,10 @@ if (FMOD) set(FMOD_FIND_REQUIRED ON) include(FindFMOD) else (STANDALONE) - include(Prebuilt) - use_prebuilt_binary(fmod) + if (INSTALL_PROPRIETARY) + include(Prebuilt) + use_prebuilt_binary(fmod) + endif (INSTALL_PROPRIETARY) if (WINDOWS) set(FMOD_LIBRARY fmod) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index e869b9717c..21ec622819 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -14,7 +14,6 @@ include(LLVFS) include_directories( ${LLAUDIO_INCLUDE_DIRS} - ${FMOD_INCLUDE_DIR} ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} @@ -45,6 +44,10 @@ set(llaudio_HEADER_FILES ) if (FMOD) + include_directories( + ${FMOD_INCLUDE_DIR} + ) + list(APPEND llaudio_SOURCE_FILES llaudioengine_fmod.cpp lllistener_fmod.cpp From 6980a78faf4793f2d2a0f09063fcb95fbd764d77 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 26 Oct 2010 22:14:53 +0200 Subject: [PATCH 06/15] - imported : [VWR-23406] Link error: undefined reference to `LLPanelStandStopFlying::getInstance -> needed for Linux (thankies Satomi) --HG-- branch : Viewer-Build --- indra/newview/llmoveview.cpp | 30 +++++------------------------- indra/newview/llmoveview.h | 11 ++++------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 6658e1d7e8..0e4bfa4d2d 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -545,17 +545,12 @@ LLPanelStandStopFlying::LLPanelStandStopFlying() : mStopFlyingButton(NULL), mAttached(false) { - // make sure we have the only instance of this class - static bool b = true; - llassert_always(b); - b=false; -} + buildFromFile("panel_stand_stop_flying.xml"); + setVisible(FALSE); -// static -inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() -{ - static LLPanelStandStopFlying* panel = getStandStopFlyingPanel(); - return panel; + llinfos << "Build LLPanelStandStopFlying panel" << llendl; + + updatePosition(); } //static @@ -693,21 +688,6 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view) // Private Section ////////////////////////////////////////////////////////////////////////// -//static -LLPanelStandStopFlying* LLPanelStandStopFlying::getStandStopFlyingPanel() -{ - LLPanelStandStopFlying* panel = new LLPanelStandStopFlying(); - panel->buildFromFile("panel_stand_stop_flying.xml"); - - panel->setVisible(FALSE); - //LLUI::getRootView()->addChild(panel); - - llinfos << "Build LLPanelStandStopFlying panel" << llendl; - - panel->updatePosition(); - return panel; -} - void LLPanelStandStopFlying::onStandButtonClick() { LLFirstUse::sit(false); diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 1b87864651..156f1762a9 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -28,6 +28,7 @@ #define LL_LLMOVEVIEW_H // Library includes +#include "llsingleton.h" #include "lltransientdockablefloater.h" class LLButton; @@ -117,7 +118,7 @@ private: /** * This class contains Stand Up and Stop Flying buttons displayed above Move button in bottom tray */ -class LLPanelStandStopFlying : public LLPanel +class LLPanelStandStopFlying : public LLPanel, public LLSingleton { LOG_CLASS(LLPanelStandStopFlying); public: @@ -127,6 +128,8 @@ public: SSFM_STOP_FLYING } EStandStopFlyingMode; + LLPanelStandStopFlying(); + /** * Attach or detach the panel to/from the movement controls floater. * @@ -140,7 +143,6 @@ public: */ void reparent(LLFloaterMove* move_view); - static LLPanelStandStopFlying* getInstance(); static void setStandStopFlyingMode(EStandStopFlyingMode mode); static void clearStandStopFlyingMode(EStandStopFlyingMode mode); /*virtual*/ BOOL postBuild(); @@ -152,12 +154,7 @@ public: /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); -protected: - LLPanelStandStopFlying(); - - private: - static LLPanelStandStopFlying* getStandStopFlyingPanel(); void onStandButtonClick(); void onStopFlyingButtonClick(); void updatePosition(); From 98bd83b0137cc2f799352cd83072408ed4370f67 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 5 Nov 2010 20:21:57 +0100 Subject: [PATCH 07/15] - changed : removed LL's 2.3.0 beta tags --HG-- branch : Viewer-Build --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index b017587d97..46f3f0af3f 100644 --- a/.hgtags +++ b/.hgtags @@ -73,3 +73,5 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d 2.3.0-beta2 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 From 751107444194acdff0948aa5ad84f8ca12b606d9 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 5 Nov 2010 20:25:17 +0100 Subject: [PATCH 08/15] - changed : updated patch description --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.desc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc index 6877c971df..b31d3c4130 100644 --- a/.hgpatchinfo/Viewer-Build.desc +++ b/.hgpatchinfo/Viewer-Build.desc @@ -1,5 +1,7 @@ [Viewer/Build] -- changed : compiler options for "Release with Debug" builds -- changed : compiler and linker options for "Release" builds -- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions -- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases \ No newline at end of file +- changed : compiler options for "Release with Debug" builds +- changed : compiler and linker options for "Release" builds +- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions +- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases +- imported : [VWR-23406] Link error: undefined reference to `LLPanelStandStopFlying::getInstance + -> needed for Linux (thankies Satomi) From a49012b35c424fcd0a008f07e1f945cf1ddb8665 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 4 Dec 2010 04:56:39 +0100 Subject: [PATCH 09/15] - internal : backed out changeset 6a9143fa9c3f ([VWR-23406] Link error: undefined reference to LLPanelStandStopFlying::getInstance) -> fixed by upstream --HG-- branch : Viewer-Build --- indra/newview/llmoveview.cpp | 30 +++++++++++++++++++++++++----- indra/newview/llmoveview.h | 11 +++++++---- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 0e4bfa4d2d..6658e1d7e8 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -545,12 +545,17 @@ LLPanelStandStopFlying::LLPanelStandStopFlying() : mStopFlyingButton(NULL), mAttached(false) { - buildFromFile("panel_stand_stop_flying.xml"); - setVisible(FALSE); + // make sure we have the only instance of this class + static bool b = true; + llassert_always(b); + b=false; +} - llinfos << "Build LLPanelStandStopFlying panel" << llendl; - - updatePosition(); +// static +inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() +{ + static LLPanelStandStopFlying* panel = getStandStopFlyingPanel(); + return panel; } //static @@ -688,6 +693,21 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view) // Private Section ////////////////////////////////////////////////////////////////////////// +//static +LLPanelStandStopFlying* LLPanelStandStopFlying::getStandStopFlyingPanel() +{ + LLPanelStandStopFlying* panel = new LLPanelStandStopFlying(); + panel->buildFromFile("panel_stand_stop_flying.xml"); + + panel->setVisible(FALSE); + //LLUI::getRootView()->addChild(panel); + + llinfos << "Build LLPanelStandStopFlying panel" << llendl; + + panel->updatePosition(); + return panel; +} + void LLPanelStandStopFlying::onStandButtonClick() { LLFirstUse::sit(false); diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 156f1762a9..1b87864651 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -28,7 +28,6 @@ #define LL_LLMOVEVIEW_H // Library includes -#include "llsingleton.h" #include "lltransientdockablefloater.h" class LLButton; @@ -118,7 +117,7 @@ private: /** * This class contains Stand Up and Stop Flying buttons displayed above Move button in bottom tray */ -class LLPanelStandStopFlying : public LLPanel, public LLSingleton +class LLPanelStandStopFlying : public LLPanel { LOG_CLASS(LLPanelStandStopFlying); public: @@ -128,8 +127,6 @@ public: SSFM_STOP_FLYING } EStandStopFlyingMode; - LLPanelStandStopFlying(); - /** * Attach or detach the panel to/from the movement controls floater. * @@ -143,6 +140,7 @@ public: */ void reparent(LLFloaterMove* move_view); + static LLPanelStandStopFlying* getInstance(); static void setStandStopFlyingMode(EStandStopFlyingMode mode); static void clearStandStopFlyingMode(EStandStopFlyingMode mode); /*virtual*/ BOOL postBuild(); @@ -154,7 +152,12 @@ public: /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); +protected: + LLPanelStandStopFlying(); + + private: + static LLPanelStandStopFlying* getStandStopFlyingPanel(); void onStandButtonClick(); void onStopFlyingButtonClick(); void updatePosition(); From 944665a64f649dfd3579ed1cb031784469775b41 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 4 Dec 2010 05:04:52 +0100 Subject: [PATCH 10/15] - internal : removed new LL tags and created a SL-2.3.0 tag for the 2.3 release --HG-- branch : Viewer-Build --- .hgtags | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.hgtags b/.hgtags index 39b520939e..bc36e5dba9 100644 --- a/.hgtags +++ b/.hgtags @@ -15,6 +15,7 @@ bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release 52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3 668851b2ef0f8cf8df07a0fba429e4a6c1e70abb viewer-2-0-1 668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1 +6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 SL-2.3.0 6e3b2e13906ba8ff22d3c8490b02d518adb2c907 2-1-1-beta-2 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f alpha-4 7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f fork to viewer-20qa @@ -79,3 +80,5 @@ dbc206fc61d89ff4cfe15aade0bf0c7bc7fee1c9 2.4.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 From 867614b044ba255be476d813d44dc9f6d12daaff Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 4 Dec 2010 05:07:41 +0100 Subject: [PATCH 11/15] - internal : updated patch description for Viewer-Build --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.desc | 2 -- 1 file changed, 2 deletions(-) diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc index b31d3c4130..122ab7adfb 100644 --- a/.hgpatchinfo/Viewer-Build.desc +++ b/.hgpatchinfo/Viewer-Build.desc @@ -3,5 +3,3 @@ - changed : compiler and linker options for "Release" builds - added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions - changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases -- imported : [VWR-23406] Link error: undefined reference to `LLPanelStandStopFlying::getInstance - -> needed for Linux (thankies Satomi) From 0ac151bb11a5f243e71389ab33cbef840be1fb83 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 4 Dec 2010 05:26:14 +0100 Subject: [PATCH 12/15] - changed : break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds [Windows only] --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.desc | 10 ++++++---- indra/newview/llappviewer.cpp | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc index 122ab7adfb..f784e6d741 100644 --- a/.hgpatchinfo/Viewer-Build.desc +++ b/.hgpatchinfo/Viewer-Build.desc @@ -1,5 +1,7 @@ [Viewer/Build] -- changed : compiler options for "Release with Debug" builds -- changed : compiler and linker options for "Release" builds -- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions -- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases +- changed : compiler options for "Release with Debug" builds +- changed : compiler and linker options for "Release" builds +- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions +- 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 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6c07974f69..531d03dff8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1792,7 +1792,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.0g) | 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() From d36c14659c7701eca821bcdd5fbe9ae1eea1c808 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 14 Feb 2011 13:41:50 +0100 Subject: [PATCH 13/15] - internal : reviewed for SL-2.5.0 --HG-- branch : Viewer-Build --- .hgtags | 2 ++ indra/newview/llappviewer.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.hgtags b/.hgtags index b64896997d..f12e556c20 100644 --- a/.hgtags +++ b/.hgtags @@ -118,8 +118,10 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release 0000000000000000000000000000000000000000 2.4.0-start 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 2.5.0-beta2 0000000000000000000000000000000000000000 DRTVWR-5_2.2.0-beta1 0000000000000000000000000000000000000000 DRTVWR-3_2.2.0-beta2 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 85d2ce8b76..aa9ecf7d9e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1842,7 +1842,7 @@ void errorCallback(const std::string &error_string) gLLErrorActivated = true; // LLError::crashAndLoop(error_string); -// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.5.0a) | Added: Catznip-2.4.0g #if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS DebugBreak(); #else From bef872e109d6ceaa98f973d53a0f80b8e2e4931c Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 14 Feb 2011 15:38:39 +0100 Subject: [PATCH 14/15] Updated patch branch dependency --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.dep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hgpatchinfo/Viewer-Build.dep b/.hgpatchinfo/Viewer-Build.dep index b04ad967ec..a5139b3e6b 100644 --- a/.hgpatchinfo/Viewer-Build.dep +++ b/.hgpatchinfo/Viewer-Build.dep @@ -1 +1 @@ -76f586a8e22b1abe6b2339758c8ac0fa718975de \ No newline at end of file +e5176946eb046c20970c7a3a50e8ee7e5c033b27 \ No newline at end of file From 2f12907d62132ebf0ba7becf369d137c89afa5e7 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 24 May 2011 20:43:51 +0200 Subject: [PATCH 15/15] - internal : fix EOL in llviewermessage.cpp --HG-- branch : Viewer-Build --- indra/newview/llviewermessage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 298e789f65..e3cb8965eb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5373,10 +5373,10 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) { // notification was specified using the new mechanism, so we can just handle it here std::string notificationID; - msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID); - if (!LLNotifications::getInstance()->templateExists(notificationID)) - { - return false; + msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID); + if (!LLNotifications::getInstance()->templateExists(notificationID)) + { + return false; } std::string llsdRaw;