Skip to content

Commit c968344

Browse files
vir-lindenvir-linden
committed
merge
2 parents 4db41e2 + 5fbbfb6 commit c968344

File tree

138 files changed

+1516
-980
lines changed

Some content is hidden

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

138 files changed

+1516
-980
lines changed

‎.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
# autobuild-package.xml.
7373
AUTOBUILD_VCS_INFO: "true"
7474
AUTOBUILD_VSVER: "170"
75-
DEVELOPER_DIR: "/Applications/Xcode_14.3.1.app/Contents/Developer"
75+
DEVELOPER_DIR: "/Applications/Xcode_16.0.app/Contents/Developer"
7676
# Ensure that Linden viewer builds engage Bugsplat.
7777
BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
7878
build_coverity: false
@@ -250,7 +250,7 @@ jobs:
250250
export viewer_channel="Second Life Test"
251251
fi
252252
fi
253-
echo "viewer_channel=$viewer_channel"
253+
echo "::notice::$RUNNER_OS viewer_channel=$viewer_channel"
254254
echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
255255
# On windows we need to point the build to the correct python
256256
# as neither CMake's FindPython nor our custom Python.cmake module

‎autobuild.xml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
<key>archive</key>
2727
<map>
2828
<key>hash</key>
29-
<string>fd6368b53609b078b4ed8816bad1d1de2756f4f2</string>
29+
<string>3f2f65cb135cd9d4704371eaf6d973517c372161</string>
3030
<key>hash_algorithm</key>
3131
<string>sha1</string>
3232
<key>url</key>
33-
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0/SDL2-2.28.0-darwin64-5991c8f.tar.zst</string>
33+
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-darwin64-11540565100.tar.zst</string>
3434
</map>
3535
<key>name</key>
3636
<string>darwin64</string>
@@ -40,11 +40,11 @@
4040
<key>archive</key>
4141
<map>
4242
<key>hash</key>
43-
<string>6bbad9b30ee93749e4701313c537d5bac0850e2b</string>
43+
<string>27a431140f6f3f12f00b6a38f741fab43caa7708</string>
4444
<key>hash_algorithm</key>
4545
<string>sha1</string>
4646
<key>url</key>
47-
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.6-r1/SDL2-2.30.6-linux64-10323260130.tar.zst</string>
47+
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-linux64-11540565100.tar.zst</string>
4848
</map>
4949
<key>name</key>
5050
<string>linux64</string>
@@ -54,16 +54,18 @@
5454
<key>archive</key>
5555
<map>
5656
<key>hash</key>
57-
<string>48e8d971dfa8025353293ead7d41a2a77b004faa</string>
57+
<string>f3485e4a02a7e8ba899e17cdc9ff0aaad661fcc1</string>
5858
<key>hash_algorithm</key>
5959
<string>sha1</string>
6060
<key>url</key>
61-
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.28.0/SDL2-2.28.0-windows64-5991c8f.tar.zst</string>
61+
<string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-windows64-11540565100.tar.zst</string>
6262
</map>
6363
<key>name</key>
6464
<string>windows64</string>
6565
</map>
6666
</map>
67+
<key>version</key>
68+
<string>2.30.8</string>
6769
</map>
6870
<key>apr_suite</key>
6971
<map>
@@ -1044,11 +1046,11 @@
10441046
<key>creds</key>
10451047
<string>github</string>
10461048
<key>hash</key>
1047-
<string>ad72fa1d103df777906f0d98f3e882b9916aeada</string>
1049+
<string>243709fbbb58a91dca81d16df650e9c6ff910d0d</string>
10481050
<key>hash_algorithm</key>
10491051
<string>sha1</string>
10501052
<key>url</key>
1051-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774118</string>
1053+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/202118207</string>
10521054
</map>
10531055
<key>name</key>
10541056
<string>darwin64</string>
@@ -1060,11 +1062,11 @@
10601062
<key>creds</key>
10611063
<string>github</string>
10621064
<key>hash</key>
1063-
<string>e46e4ac93a237b5c4a14183766f76ba5d58935a2</string>
1065+
<string>7fd0a7ee71a4e76b49e31b75f8622852324d58a4</string>
10641066
<key>hash_algorithm</key>
10651067
<string>sha1</string>
10661068
<key>url</key>
1067-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774125</string>
1069+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/202118208</string>
10681070
</map>
10691071
<key>name</key>
10701072
<string>linux64</string>
@@ -1076,11 +1078,11 @@
10761078
<key>creds</key>
10771079
<string>github</string>
10781080
<key>hash</key>
1079-
<string>bb37557f78c72b26580a521f8b8dabfa1b34e6e6</string>
1081+
<string>8c475dd9616c7e0e3029cc38aefc1e0ab34d2e73</string>
10801082
<key>hash_algorithm</key>
10811083
<string>sha1</string>
10821084
<key>url</key>
1083-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774126</string>
1085+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/202118209</string>
10841086
</map>
10851087
<key>name</key>
10861088
<string>windows64</string>
@@ -1093,7 +1095,7 @@
10931095
<key>copyright</key>
10941096
<string>Kakadu software</string>
10951097
<key>version</key>
1096-
<string>7.10.4.4b9ec5f</string>
1098+
<string>8.4.1.11540433907</string>
10971099
<key>name</key>
10981100
<string>kdu</string>
10991101
<key>description</key>
@@ -2076,11 +2078,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20762078
<key>archive</key>
20772079
<map>
20782080
<key>hash</key>
2079-
<string>da16445129cc82d23d01709a912c99fd74388395</string>
2081+
<string>cbbcf3c5341e4ff4f956c0de960dc238faf20d54</string>
20802082
<key>hash_algorithm</key>
20812083
<string>sha1</string>
20822084
<key>url</key>
2083-
<string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r3/open_libndofdev-0.14.10326946482-linux64-10326946482.tar.zst</string>
2085+
<string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r4/open_libndofdev-0.14.11545940352-linux64-11545940352.tar.zst</string>
20842086
</map>
20852087
<key>name</key>
20862088
<string>linux64</string>
@@ -2093,7 +2095,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20932095
<key>copyright</key>
20942096
<string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
20952097
<key>version</key>
2096-
<string>0.14.8730039102</string>
2098+
<string>0.14.11545940352</string>
20972099
<key>name</key>
20982100
<string>open-libndofdev</string>
20992101
<key>description</key>

‎indra/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ else()
2929
set( USE_AUTOBUILD_3P ON )
3030
endif()
3131

32+
set(CMAKE_CXX_STANDARD 20)
33+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
34+
3235
include(Variables)
3336
include(BuildVersion)
3437

‎indra/cmake/LLKDU.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ if (USE_KDU)
2323
${AUTOBUILD_INSTALL_DIR}/include/kdu
2424
${LIBS_OPEN_DIR}/llkdu
2525
)
26+
target_compile_definitions(ll::kdu INTERFACE KDU_X86_INTRINSICS=1 KDU_NO_THREADS=1)
2627
endif (USE_KDU)

‎indra/cmake/Python.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ elseif (WINDOWS)
1313
foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
1414
# prefer more recent Python versions to older ones, if multiple versions
1515
# are installed
16-
foreach(pyver 3.12 3.11 3.10 3.9 3.8 3.7)
16+
foreach(pyver 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7)
1717
list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
1818
endforeach()
1919
endforeach()

‎indra/integration_tests/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
# -*- cmake -*-
22
add_subdirectory(llui_libtest)
3-
IF (LLIMAGE_LIBTEST)
4-
MESSAGE(STATUS "Build llimage_libtest")
5-
add_subdirectory(llimage_libtest)
6-
ELSE (LLIMAGE_LIBTEST)
7-
MESSAGE(STATUS "Skip llimage_libtest")
8-
ENDIF (LLIMAGE_LIBTEST)
3+
add_subdirectory(llimage_libtest)

‎indra/integration_tests/llimage_libtest/CMakeLists.txt

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# -*- cmake -*-
22

33
# Integration tests of the llimage library (JPEG2000, PNG, jpeg, etc... images reading and writing)
4+
if (LL_TESTS)
45

56
project (llimage_libtest)
67

78
include(00-Common)
89
include(LLCommon)
910
include(LLImage)
1011
include(LLMath)
11-
include(LLImageJ2COJ)
1212
include(LLKDU)
13-
include(LLFileSystem)
1413

1514
set(llimage_libtest_SOURCE_FILES
1615
llimage_libtest.cpp
@@ -24,17 +23,9 @@ set(llimage_libtest_HEADER_FILES
2423
list(APPEND llimage_libtest_SOURCE_FILES ${llimage_libtest_HEADER_FILES})
2524

2625
add_executable(llimage_libtest
27-
WIN32
28-
MACOSX_BUNDLE
2926
${llimage_libtest_SOURCE_FILES}
3027
)
3128

32-
set_target_properties(llimage_libtest
33-
PROPERTIES
34-
WIN32_EXECUTABLE
35-
FALSE
36-
)
37-
3829
# Libraries on which this application depends on
3930
# Sort by high-level to low-level
4031
target_link_libraries(llimage_libtest
@@ -45,61 +36,8 @@ target_link_libraries(llimage_libtest
4536
llkdu
4637
llimagej2coj
4738
)
48-
49-
if (DARWIN)
50-
# Path inside the app bundle where we'll need to copy libraries
51-
set(LLIMAGE_LIBTEST_DESTINATION_DIR
52-
${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/llimage_libtest.app/Contents/Resources
53-
)
54-
# Create the Contents/Resources directory
55-
add_custom_command(
56-
TARGET llimage_libtest POST_BUILD
57-
COMMAND ${CMAKE_COMMAND}
58-
ARGS
59-
-E
60-
make_directory
61-
${LLIMAGE_LIBTEST_DESTINATION_DIR}
62-
COMMENT "Creating Resources directory in app bundle."
63-
)
64-
else (DARWIN)
65-
set(LLIMAGE_LIBTEST_DESTINATION_DIR
66-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
67-
)
68-
endif (DARWIN)
69-
70-
get_target_property(BUILT_LLCOMMON llcommon LOCATION)
71-
add_custom_command(TARGET llimage_libtest POST_BUILD
72-
COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON} ${LLIMAGE_LIBTEST_DESTINATION_DIR}
73-
DEPENDS ${BUILT_LLCOMMON}
74-
)
75-
76-
if (DARWIN)
77-
# Copy the required libraries to the package app
78-
add_custom_command(TARGET llimage_libtest POST_BUILD
79-
COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
80-
DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib
81-
)
82-
add_custom_command(TARGET llimage_libtest POST_BUILD
83-
COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
84-
DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib
85-
)
86-
add_custom_command(TARGET llimage_libtest POST_BUILD
87-
COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
88-
DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib
89-
)
90-
foreach(expat ${EXPAT_COPY})
91-
add_custom_command(TARGET llimage_libtest POST_BUILD
92-
COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LLIMAGE_LIBTEST_DESTINATION_DIR}
93-
DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat}
94-
)
95-
endforeach(expat)
96-
endif (DARWIN)
97-
98-
if (WINDOWS)
99-
# Check indra/test_apps/llplugintest/CMakeLists.txt for an example of what to copy over for Windows and how
100-
endif (WINDOWS)
10139

10240
# Ensure people working on the viewer don't break this library
103-
# *NOTE: This could be removed, or only built by TeamCity, if the build
104-
# and link times become too long.
10541
add_dependencies(viewer llimage_libtest)
42+
43+
endif(LL_TESTS)

‎indra/integration_tests/llimage_libtest/llimage_libtest.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
#include "v4coloru.h"
4444
#include "llsdserialize.h"
4545
#include "llcleanup.h"
46+
#include "lltrace.h"
47+
#include "llfasttimer.h"
4648

4749
// system libraries
4850
#include <iostream>
@@ -573,10 +575,10 @@ int main(int argc, char** argv)
573575

574576

575577
// Create the logging thread if required
576-
if (LLFastTimer::sMetricLog)
578+
if (LLTrace::BlockTimer::sMetricLog)
577579
{
578-
LLFastTimer::sLogLock = new LLMutex(NULL);
579-
fast_timer_log_thread = new LogThread(LLFastTimer::sLogName);
580+
LLTrace::BlockTimer::setLogLock(new LLMutex());
581+
fast_timer_log_thread = new LogThread(LLTrace::BlockTimer::sLogName);
580582
fast_timer_log_thread->start();
581583
}
582584

@@ -618,19 +620,19 @@ int main(int argc, char** argv)
618620
// Output perf data if requested by user
619621
if (analyze_performance)
620622
{
621-
std::string baseline_name = LLFastTimer::sLogName + "_baseline.slp";
622-
std::string current_name = LLFastTimer::sLogName + ".slp";
623-
std::string report_name = LLFastTimer::sLogName + "_report.csv";
623+
std::string baseline_name = LLTrace::BlockTimer::sLogName + "_baseline.slp";
624+
std::string current_name = LLTrace::BlockTimer::sLogName + ".slp";
625+
std::string report_name = LLTrace::BlockTimer::sLogName + "_report.csv";
624626

625627
std::cout << "Analyzing performance, check report in : " << report_name << std::endl;
626628

627629
LLMetricPerformanceTesterBasic::doAnalysisMetrics(baseline_name, current_name, report_name);
628630
}
629631

630632
// Stop the perf gathering system if needed
631-
if (LLFastTimer::sMetricLog)
633+
if (LLTrace::BlockTimer::sMetricLog)
632634
{
633-
LLMetricPerformanceTesterBasic::deleteTester(LLFastTimer::sLogName);
635+
LLMetricPerformanceTesterBasic::deleteTester(LLTrace::BlockTimer::sLogName);
634636
sAllDone = true;
635637
}
636638

‎indra/llappearance/lltexlayerparams.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "llpointer.h"
3131
#include "v4color.h"
3232
#include "llviewervisualparam.h"
33+
#include <atomic>
3334

3435
class LLAvatarAppearance;
3536
class LLImageRaw;

‎indra/llcommon/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ set(llcommon_SOURCE_FILES
7070
llmetrics.cpp
7171
llmortician.cpp
7272
llmutex.cpp
73+
llpointer.cpp
7374
llpredicate.cpp
7475
llprocess.cpp
7576
llprocessor.cpp

0 commit comments

Comments
 (0)