From 274d549eab1c9964f91d639d7335d205a4273e7c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 9 Dec 2016 17:55:29 -0500 Subject: update llphysicsextensions build to fix environment setting problem in nested builds --- autobuild.xml | 104 ++++++++-------------------------------------------------- 1 file changed, 14 insertions(+), 90 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4ccbd25e60..38f29e6a9a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2129,52 +2129,26 @@ llphysicsextensions_source platforms - darwin - - archive - - hash - 01a7cc9d0e56238a9abedd7a41ccd0a3 - hash_algorithm - md5 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Darwin/installer/llphysicsextensions_source-1.0.313564-darwin-313564.tar.bz2 - - name - darwin - darwin64 archive hash - 8d66b068425d2cbc65949c83d7f37d23 + 7b82d09b4104eabd67e2df859e6d605d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/486/1031/llphysicsextensions_source-1.0.500392-darwin64-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1447/3223/llphysicsextensions_source-1.0.501434-darwin64-501434.tar.bz2 name darwin64 - linux - - archive - - hash - 18ebea18be4cf0d3da4a6bb73787395c - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/p64_llphysicsextensions/rev/314244/arch/Linux/installer/llphysicsextensions_source-1.0.314244-linux-314244.tar.bz2 - - name - linux - linux64 archive hash - 20279e8be7f8971c59f0b8f6aa513098 + be50e58459c3e334715b108646b8712b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/463/980/llphysicsextensions_source-1.0.500392-linux64-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1445/3211/llphysicsextensions_source-1.0.501434-linux64-501434.tar.bz2 name linux64 @@ -2184,28 +2158,16 @@ archive hash - 0ac91b8fadeebb767d8c7a4ab5272319 + 83a0328f6ab88b0960ea5d905bd2e7a2 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/508/1090/llphysicsextensions_source-1.0.500392-windows-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1448/3226/llphysicsextensions_source-1.0.501434-windows-501434.tar.bz2 name windows - windows64 - - archive - - hash - ec95c627af598b6db5be99cff5559699 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/507/1087/llphysicsextensions_source-1.0.500392-windows64-500392.tar.bz2 - - name - windows64 - version - 1.0.500392 + 1.0.501434 llphysicsextensions_stub @@ -2219,52 +2181,26 @@ llphysicsextensions_stub platforms - darwin - - archive - - hash - c8c6e5867d1ead7ad452a3359b22cf44 - hash_algorithm - md5 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Darwin/installer/llphysicsextensions_stub-1.0.313563-darwin-313563.tar.bz2 - - name - darwin - darwin64 archive hash - c7676595a2b49e41aa3e32bf99e5cf2f + bc5989dee9d9be95d63178ce2f735385 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1081/2505/llphysicsextensions_stub-1.0.501069-darwin64-501069.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1446/3218/llphysicsextensions_stub-1.0.501433-darwin64-501433.tar.bz2 name darwin64 - linux - - archive - - hash - f7dc825d13dec920a36641823f87dd94 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_llphysicsextensions/rev/314246/arch/Linux/installer/llphysicsextensions_stub-1.0.314246-linux-314246.tar.bz2 - - name - linux - linux64 archive hash - 430a1c16c2a0f999742411389e6bb50f + 352e71a8fcfc854e6c2fd477fa08ac14 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1080/2500/llphysicsextensions_stub-1.0.501069-linux64-501069.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1444/3210/llphysicsextensions_stub-1.0.501433-linux64-501433.tar.bz2 name linux64 @@ -2274,28 +2210,16 @@ archive hash - 72b163adfc692d4930fa391043329c88 + e5a7e4793ffa0cc9b73ae962fb697a49 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1083/2511/llphysicsextensions_stub-1.0.501069-windows-501069.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1449/3227/llphysicsextensions_stub-1.0.501433-windows-501433.tar.bz2 name windows - windows64 - - archive - - hash - b0a066c3fcee095843d9077ccbc8a75b - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1082/2508/llphysicsextensions_stub-1.0.501069-windows64-501069.tar.bz2 - - name - windows64 - version - 1.0.501069 + 1.0.501433 mesa -- cgit v1.2.3 From c20e57c48f957ef13d259e54de908153ac996ca7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 20 Dec 2016 14:41:46 -0500 Subject: move debugging globals to the "lowest" library they are referenced in --- indra/llmath/CMakeLists.txt | 1 + indra/llmath/lloctree.cpp | 29 +++++++++++++++++++++++++++++ indra/llmath/llvolume.cpp | 2 +- indra/llmath/llvolume.h | 2 ++ indra/llrender/llgl.cpp | 1 - indra/newview/llspatialpartition.cpp | 3 --- 6 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 indra/llmath/lloctree.cpp diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index 0614fd92ef..fc9bfe7210 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -20,6 +20,7 @@ set(llmath_SOURCE_FILES llline.cpp llmatrix3a.cpp llmodularmath.cpp + lloctree.cpp llperlin.cpp llquaternion.cpp llrect.cpp diff --git a/indra/llmath/lloctree.cpp b/indra/llmath/lloctree.cpp new file mode 100644 index 0000000000..3fcb3a27d7 --- /dev/null +++ b/indra/llmath/lloctree.cpp @@ -0,0 +1,29 @@ +/** + * @file lloctree.cpp + * + * $LicenseInfo:firstyear=2005&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ +#include "stdtypes.h" + +U32 gOctreeMaxCapacity; +F32 gOctreeMinSize; + diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 6f0b4b2410..f63a721c35 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -89,7 +89,7 @@ const F32 SKEW_MAX = 0.95f; const F32 SCULPT_MIN_AREA = 0.002f; const S32 SCULPT_MIN_AREA_DETAIL = 1; -extern BOOL gDebugGL; +BOOL gDebugGL = FALSE; BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm) { diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index d66004cdad..bf81c978a0 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -199,6 +199,8 @@ const U8 LL_SCULPT_FLAG_MASK = LL_SCULPT_FLAG_INVERT | LL_SCULPT_FLAG_MIRROR; const S32 LL_SCULPT_MESH_MAX_FACES = 8; +extern BOOL gDebugGL; + class LLProfileParams { public: diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 7757198af5..18063e9700 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -55,7 +55,6 @@ BOOL gDebugSession = FALSE; -BOOL gDebugGL = FALSE; BOOL gClothRipple = FALSE; BOOL gHeadlessClient = FALSE; BOOL gGLActive = FALSE; diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 0fd36766b3..94b838e829 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -61,9 +61,6 @@ extern bool gShiftFrame; static U32 sZombieGroups = 0; U32 LLSpatialGroup::sNodeCount = 0; -U32 gOctreeMaxCapacity; -F32 gOctreeMinSize; - BOOL LLSpatialGroup::sNoDelete = FALSE; static F32 sLastMaxTexPriority = 1.f; -- cgit v1.2.3 From 725ba32d08a513580a87368d986918dd892c4c37 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 20 Dec 2016 17:18:56 -0500 Subject: don't add llcorehttp to all tests --- indra/cmake/LLAddBuildTest.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index db8b95dbe2..96d3e39a06 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -35,7 +35,6 @@ INCLUDE(GoogleMock) ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} llcommon - llcorehttp ) IF(NOT "${project}" STREQUAL "llmath") # add llmath as a dep unless the tested module *is* llmath! -- cgit v1.2.3 From d34530fd07e62c25e010e6373860b358855c96cd Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 20 Dec 2016 16:28:53 -0800 Subject: DRTVWR-418 fix BOOL/bool comparison that errors out as as warning on VS 2013 builds --- indra/newview/llappviewer.cpp | 4 ++-- indra/newview/llappviewer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 06d6f76cce..97a5ca3f07 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -333,10 +333,10 @@ BOOL gDisconnected = FALSE; // used to restore texture state after a mode switch LLFrameTimer gRestoreGLTimer; BOOL gRestoreGL = FALSE; -BOOL gUseWireframe = FALSE; +bool gUseWireframe = FALSE; //use for remember deferred mode in wireframe switch -BOOL gInitialDeferredModeForWireframe = FALSE; +bool gInitialDeferredModeForWireframe = FALSE; // VFS globals - see llappviewer.h LLVFS* gStaticVFS = NULL; diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 948d316009..d4875cc7c1 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -391,8 +391,8 @@ extern BOOL gDisconnected; extern LLFrameTimer gRestoreGLTimer; extern BOOL gRestoreGL; -extern BOOL gUseWireframe; -extern BOOL gInitialDeferredModeForWireframe; +extern bool gUseWireframe; +extern bool gInitialDeferredModeForWireframe; // VFS globals - gVFS is for general use // gStaticVFS is read-only and is shipped w/ the viewer -- cgit v1.2.3 From 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 21 Dec 2016 16:40:23 -0500 Subject: try using xcodebuild -quiet --- autobuild.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index ee9c56384d..07a015e76f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3328,6 +3328,7 @@ options + -quiet -configuration RelWithDebInfo -project @@ -3359,6 +3360,7 @@ xcodebuild options + -quiet -configuration RelWithDebInfo -project @@ -3388,6 +3390,7 @@ options + -quiet -configuration Release -project @@ -3419,6 +3422,7 @@ xcodebuild options + -quiet -configuration Release -project SecondLife.xcodeproj -DENABLE_SIGNING:BOOL=YES -- cgit v1.2.3 From 9c0536f09921cbcff69aa86bcce9defab08ff04a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 22 Dec 2016 12:59:30 -0500 Subject: remove the xcodebuild -quiet because Xcode 7 doesn't do it --- autobuild.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6933fe704d..2bf12fcba0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3328,7 +3328,6 @@ options - -quiet -configuration RelWithDebInfo -project @@ -3360,7 +3359,6 @@ xcodebuild options - -quiet -configuration RelWithDebInfo -project @@ -3390,7 +3388,6 @@ options - -quiet -configuration Release -project @@ -3422,7 +3419,6 @@ xcodebuild options - -quiet -configuration Release -project SecondLife.xcodeproj -DENABLE_SIGNING:BOOL=YES -- cgit v1.2.3 From 25c620d1f03dd31f31d7ec2e24510ef1fde4c37a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 30 Jan 2017 15:49:49 -0500 Subject: DRTVWR-418: Backed out changeset f03df2b249d0: restore -quiet. As of now, this fork requires Xcode 8, which introduces support for the -quiet switch. --- autobuild.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index 2bf12fcba0..6933fe704d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3328,6 +3328,7 @@ options + -quiet -configuration RelWithDebInfo -project @@ -3359,6 +3360,7 @@ xcodebuild options + -quiet -configuration RelWithDebInfo -project @@ -3388,6 +3390,7 @@ options + -quiet -configuration Release -project @@ -3419,6 +3422,7 @@ xcodebuild options + -quiet -configuration Release -project SecondLife.xcodeproj -DENABLE_SIGNING:BOOL=YES -- cgit v1.2.3 From f0a79147210c4ef402dce10a0a3c796807298033 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 3 Feb 2017 10:43:47 -0500 Subject: DRTVWR-418: INTEGRATION_TEST_llurlentry depends on Hunspell. --- indra/llui/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 7fb1db15fb..8054eb3619 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -3,6 +3,7 @@ project(llui) include(00-Common) +include(Hunspell) include(LLCommon) include(LLImage) include(LLInventory) @@ -294,7 +295,11 @@ if(LL_TESTS) ) LL_ADD_PROJECT_UNIT_TESTS(llui "${llui_TEST_SOURCE_FILES}") # INTEGRATION TESTS - set(test_libs llui llmessage llcorehttp llcommon ${LLCOMMON_LIBRARIES} ${BOOST_COROUTINE_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_SYSTEM_LIBRARY} ${WINDOWS_LIBRARIES}) + set(test_libs llui llmessage llcorehttp llcommon + ${HUNSPELL_LIBRARY} + ${LLCOMMON_LIBRARIES} + ${BOOST_COROUTINE_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_SYSTEM_LIBRARY} + ${WINDOWS_LIBRARIES}) if(NOT LINUX) LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}") endif(NOT LINUX) -- cgit v1.2.3