Skip to content

Commit d1c0a5b

Browse files
marchcatmarchcat
committed
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2 parents 6f99a84 + 53e958a commit d1c0a5b

File tree

800 files changed

+47501
-42240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

800 files changed

+47501
-42240
lines changed

‎.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,29 @@
77
*.pyc
88
*.rej
99
*.swp
10+
*.vcxproj
11+
*.filters
12+
*.sln
13+
*.depend
14+
*.stamp
15+
*.rc
16+
1017
*~
1118

1219
# Specific paths and/or names
20+
CMakeCache.txt
21+
cmake_install.cmake
1322
LICENSES
1423
build-darwin-*
1524
build-linux-*
1625
debian/files
1726
debian/secondlife-appearance-utility*
1827
debian/secondlife-viewer*
1928
indra/.distcc
29+
indra/cmake/*
30+
indra/out/*
31+
32+
indra/packages/*
2033
build-vc80/
2134
build-vc100/
2235
build-vc120/

‎autobuild.xml

Lines changed: 162 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -702,11 +702,11 @@
702702
<key>archive</key>
703703
<map>
704704
<key>hash</key>
705-
<string>34af0a90a3015b7e7ec2486090bc4ce6ee5be758</string>
705+
<string>7cc58b3acb230a7e65ea5f0ff800be393eb4aa1b</string>
706706
<key>hash_algorithm</key>
707707
<string>sha1</string>
708708
<key>url</key>
709-
<string>https://github.com/secondlife/3p-glext/releases/download/v68-af397ee/glext-68-common-af397ee.tar.zst</string>
709+
<string>https://github.com/secondlife/3p-glext/releases/download/v69/glext-68-common-685b36e.tar.zst</string>
710710
</map>
711711
<key>name</key>
712712
<string>common</string>
@@ -1732,6 +1732,62 @@
17321732
<key>description</key>
17331733
<string>Meshoptimizer. Mesh optimization library.</string>
17341734
</map>
1735+
<key>mikktspace</key>
1736+
<map>
1737+
<key>canonical_repo</key>
1738+
<string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
1739+
<key>copyright</key>
1740+
<string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
1741+
<key>description</key>
1742+
<string>Mikktspace Tangent Generator</string>
1743+
<key>license</key>
1744+
<string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
1745+
<key>license_file</key>
1746+
<string>mikktspace.txt</string>
1747+
<key>name</key>
1748+
<string>mikktspace</string>
1749+
<key>platforms</key>
1750+
<map>
1751+
<key>darwin64</key>
1752+
<map>
1753+
<key>archive</key>
1754+
<map>
1755+
<key>hash</key>
1756+
<string>b48b7ac0792d3ea8f087d99d9e4a29d8</string>
1757+
<key>url</key>
1758+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104415/914944/mikktspace-1-darwin64-574859.tar.bz2</string>
1759+
</map>
1760+
<key>name</key>
1761+
<string>darwin64</string>
1762+
</map>
1763+
<key>windows</key>
1764+
<map>
1765+
<key>archive</key>
1766+
<map>
1767+
<key>hash</key>
1768+
<string>0a016b9c0c1e2c0b557e0124094da6c5</string>
1769+
<key>url</key>
1770+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104407/914918/mikktspace-1-windows-574859.tar.bz2</string>
1771+
</map>
1772+
<key>name</key>
1773+
<string>windows</string>
1774+
</map>
1775+
<key>windows64</key>
1776+
<map>
1777+
<key>archive</key>
1778+
<map>
1779+
<key>hash</key>
1780+
<string>02e9e5b6fe6788f4d2babb83ec544843</string>
1781+
<key>url</key>
1782+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104406/914909/mikktspace-1-windows64-574859.tar.bz2</string>
1783+
</map>
1784+
<key>name</key>
1785+
<string>windows64</string>
1786+
</map>
1787+
</map>
1788+
<key>version</key>
1789+
<string>1</string>
1790+
</map>
17351791
<key>minizip-ng</key>
17361792
<map>
17371793
<key>platforms</key>
@@ -2318,6 +2374,42 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
23182374
<key>name</key>
23192375
<string>threejs</string>
23202376
</map>
2377+
<key>tinygltf</key>
2378+
<map>
2379+
<key>canonical_repo</key>
2380+
<string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
2381+
<key>copyright</key>
2382+
<string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
2383+
<key>description</key>
2384+
<string>tinygltf import library</string>
2385+
<key>license</key>
2386+
<string>MIT</string>
2387+
<key>license_file</key>
2388+
<string>LICENSES/tinygltf_license.txt</string>
2389+
<key>name</key>
2390+
<string>tinygltf</string>
2391+
<key>platforms</key>
2392+
<map>
2393+
<key>common</key>
2394+
<map>
2395+
<key>archive</key>
2396+
<map>
2397+
<key>hash</key>
2398+
<string>4dad1c0948141e1667c01a3ee755e4dc</string>
2399+
<key>url</key>
2400+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105849/926137/tinygltf-v2.5.0-common-575729.tar.bz2</string>
2401+
</map>
2402+
<key>name</key>
2403+
<string>common</string>
2404+
</map>
2405+
</map>
2406+
<key>source</key>
2407+
<string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
2408+
<key>source_type</key>
2409+
<string>git</string>
2410+
<key>version</key>
2411+
<string>v2.5.0</string>
2412+
</map>
23212413
<key>tracy</key>
23222414
<map>
23232415
<key>platforms</key>
@@ -2327,11 +2419,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
23272419
<key>archive</key>
23282420
<map>
23292421
<key>hash</key>
2330-
<string>b84ccb1606b3fc5b216d0123a23a4922e02b6bd8</string>
2331-
<key>hash_algorithm</key>
2332-
<string>sha1</string>
2422+
<string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
23332423
<key>url</key>
2334-
<string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-235e98f/tracy-v0.8.1.235e98f-darwin64-235e98f.tar.zst</string>
2424+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
23352425
</map>
23362426
<key>name</key>
23372427
<string>darwin64</string>
@@ -2341,11 +2431,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
23412431
<key>archive</key>
23422432
<map>
23432433
<key>hash</key>
2344-
<string>54f126b85f179362cf0b6024e3cd621b53d68703</string>
2434+
<string>05b72ae5d733aed7d3bf142287601cc6</string>
23452435
<key>hash_algorithm</key>
2346-
<string>sha1</string>
2436+
<string>md5</string>
23472437
<key>url</key>
2348-
<string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-235e98f/tracy-v0.8.1.235e98f-windows64-235e98f.tar.zst</string>
2438+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
23492439
</map>
23502440
<key>name</key>
23512441
<string>windows64</string>
@@ -2369,6 +2459,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
23692459
<string>https://bitbucket.org/lindenlab/3p-tracy</string>
23702460
<key>source_type</key>
23712461
<string>git</string>
2462+
<key>version</key>
2463+
<string>v0.8.1.578241</string>
23722464
</map>
23732465
<key>tut</key>
23742466
<map>
@@ -2630,6 +2722,62 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
26302722
<key>description</key>
26312723
<string>XMLRPC Library</string>
26322724
</map>
2725+
<key>vulkan_gltf</key>
2726+
<map>
2727+
<key>canonical_repo</key>
2728+
<string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
2729+
<key>copyright</key>
2730+
<string>Copyright (c) 2018 Sascha Willems</string>
2731+
<key>description</key>
2732+
<string>Vulkan GLTF Sample Implementation</string>
2733+
<key>license</key>
2734+
<string>Copyright (c) 2018 Sascha Willems</string>
2735+
<key>license_file</key>
2736+
<string>LICENSES/vulkan_gltf.txt</string>
2737+
<key>name</key>
2738+
<string>vulkan_gltf</string>
2739+
<key>platforms</key>
2740+
<map>
2741+
<key>darwin64</key>
2742+
<map>
2743+
<key>archive</key>
2744+
<map>
2745+
<key>hash</key>
2746+
<string>8cff2060843db3db788511ee34a8e8cc</string>
2747+
<key>url</key>
2748+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
2749+
</map>
2750+
<key>name</key>
2751+
<string>darwin64</string>
2752+
</map>
2753+
<key>windows</key>
2754+
<map>
2755+
<key>archive</key>
2756+
<map>
2757+
<key>hash</key>
2758+
<string>58eea384be49ba756ce9c5e66669540b</string>
2759+
<key>url</key>
2760+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
2761+
</map>
2762+
<key>name</key>
2763+
<string>windows</string>
2764+
</map>
2765+
<key>windows64</key>
2766+
<map>
2767+
<key>archive</key>
2768+
<map>
2769+
<key>hash</key>
2770+
<string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
2771+
<key>url</key>
2772+
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
2773+
</map>
2774+
<key>name</key>
2775+
<string>windows64</string>
2776+
</map>
2777+
</map>
2778+
<key>version</key>
2779+
<string>1</string>
2780+
</map>
26332781
<key>xxhash</key>
26342782
<map>
26352783
<key>platforms</key>
@@ -2887,6 +3035,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
28873035
<string>RelWithDebInfo</string>
28883036
<string>-project</string>
28893037
<string>SecondLife.xcodeproj</string>
3038+
<string>-parallelizeTargets</string>
28903039
</array>
28913040
</map>
28923041
<key>default</key>
@@ -2914,6 +3063,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
29143063
<string>RelWithDebInfo</string>
29153064
<string>-project</string>
29163065
<string>SecondLife.xcodeproj</string>
3066+
<string>-parallelizeTargets</string>
29173067
</array>
29183068
</map>
29193069
<key>name</key>
@@ -2943,6 +3093,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
29433093
<string>Release</string>
29443094
<string>-project</string>
29453095
<string>SecondLife.xcodeproj</string>
3096+
<string>-parallelizeTargets</string>
29463097
</array>
29473098
</map>
29483099
<key>name</key>
@@ -2968,6 +3119,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
29683119
<string>Release</string>
29693120
<string>-project</string>
29703121
<string>SecondLife.xcodeproj</string>
3122+
<string>-parallelizeTargets</string>
29713123
</array>
29723124
</map>
29733125
<key>name</key>
@@ -3217,4 +3369,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32173369
<string>Second Life Viewer</string>
32183370
</map>
32193371
</map>
3220-
</llsd>
3372+
</llsd>

‎doc/contributions.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Agathos Frascati
1919
CT-317
2020
CT-352
2121
Ai Austin
22+
SL-19399
2223
Aiko Ying
2324
Aimee Trescothick
2425
SNOW-227
@@ -1421,6 +1422,7 @@ Sovereign Engineer
14211422
SL-18497
14221423
SL-18525
14231424
SL-18534
1425+
SL-19690
14241426
SL-19336
14251427
SpacedOut Frye
14261428
VWR-34

‎indra/cmake/00-Common.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,4 @@ if (LINUX OR DARWIN)
187187
endif (LINUX OR DARWIN)
188188

189189

190+

‎indra/cmake/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ set(cmake_SOURCE_FILES
6464
VisualLeakDetector.cmake
6565
LibVLCPlugin.cmake
6666
XmlRpcEpi.cmake
67+
xxHash.cmake
6768
ZLIBNG.cmake
6869
)
6970

‎indra/cmake/FMODSTUDIO.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
include_guard()
44

5-
# FMODSTUDIO can be set when launching the make using the argument -DFMODSTUDIO:BOOL=ON
5+
# FMODSTUDIO can be set when launching the make using the argument -DUSE_FMODSTUDIO:BOOL=ON
66
# When building using proprietary binaries though (i.e. having access to LL private servers),
77
# we always build with FMODSTUDIO.
88
if (INSTALL_PROPRIETARY)

‎indra/cmake/GLEXT.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ include(Prebuilt)
33
include(GLH)
44

55
add_library( ll::glext INTERFACE IMPORTED )
6-
if (WINDOWS OR LINUX)
7-
use_system_binary(glext)
8-
use_prebuilt_binary(glext)
9-
endif (WINDOWS OR LINUX)
6+
use_system_binary(glext)
7+
use_prebuilt_binary(glext)
108

119

‎indra/cmake/LLAddBuildTest.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
126126
message("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_CFLAGS ${${name}_test_additional_CFLAGS}")
127127
endif()
128128

129+
if (DARWIN)
130+
# test binaries always need to be signed for local development
131+
set_target_properties(PROJECT_${project}_TEST_${name}
132+
PROPERTIES
133+
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
134+
endif ()
135+
129136
#
130137
# Setup test targets
131138
#
@@ -221,6 +228,13 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
221228
)
222229
endif ()
223230

231+
if (DARWIN)
232+
# test binaries always need to be signed for local development
233+
set_target_properties(INTEGRATION_TEST_${testname}
234+
PROPERTIES
235+
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
236+
endif ()
237+
224238
# Add link deps to the executable
225239
if(TEST_DEBUG)
226240
message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")

‎indra/cmake/LLMath.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# -*- cmake -*-
22

3+
include(Variables)
4+
include(Mikktspace)
5+

‎indra/cmake/Mikktspace.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# -*- cmake -*-
2+
include(Prebuilt)
3+
4+
if (NOT USESYSTEMLIBS)
5+
use_prebuilt_binary(mikktspace)
6+
endif (NOT USESYSTEMLIBS)

0 commit comments

Comments
 (0)