Skip to content

Merge Linden 2025.07 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RyeMutt wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Merge Linden 2025.07 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3eac0
Merge linden release/2025.07
RyeMutt Oct 13, 2025
83fa5dc
Add functional webrtc package for linux
RyeMutt Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 14 additions & 46 deletions autobuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,53 +1288,21 @@
<map>
<key>platforms</key>
<map>
<key>darwin64</key>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>7facda95e2f00c260513f3d4db42588fa8ba703c</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289774</string>
</map>
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>01d08f13c7bc8d1b95b0330fa6833b7d8274e4d0</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289775</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>windows64</key>
<key>common</key>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>6d00345c7d3471bc5f7c1218e014dd0f1a2c069b</string>
<string>fff82c79edb900c547c40dca9a0e3ebac5a8c7da</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289778</string>
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/299858950</string>
</map>
<key>name</key>
<string>windows64</string>
<string>common</string>
</map>
</map>
<key>license</key>
Expand Down Expand Up @@ -2428,11 +2396,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>6314fdcee81a3538a7d960178ade66301c2fa002</string>
<string>b87d3aaae14ca27350fac06e074b688202181a7d86cb7f0a2d551ceeb42473cb5e800bcbf64a83e4207297e7b65ca2c8759505f0a0e6a9a708d7cda752b49494</string>
<key>hash_algorithm</key>
<string>sha1</string>
<string>blake2b</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.73-alpha/webrtc-m114.5735.08.73-alpha.11958809572-darwin64-11958809572.tar.zst</string>
<string>https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r8/webrtc-m137.7151.04.20-r8.18457594440-darwin64-18457594440.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -2442,11 +2410,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>95d7730a3d6955697e043f3fdf20ebdcc0c71fc0</string>
<string>9e7499473f298a1a1a93a4cd829655488f5f8f363fdc35dbd6fb0b9319b6a85427f38e8368cb06faf3195fc2153fcb1c78e6d8edc1f6174ad9c5c583b6660d20</string>
<key>hash_algorithm</key>
<string>sha1</string>
<string>blake2b</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.73-alpha/webrtc-m114.5735.08.73-alpha.11958809572-linux64-11958809572.tar.zst</string>
<string>https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r8/webrtc-m137.7151.04.20-r8.18457594440-linux64-18457594440.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -2456,11 +2424,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>c7b329d6409576af6eb5b80655b007f52639c43b</string>
<string>6533d3224108b71cba82eeeddbfd1065f1f5711aaa98c77ab73f8c67eea20c3ebab7527085ba417982670fbd74ca86fc92964aed8b6799d8e2285344eb5cb6ef</string>
<key>hash_algorithm</key>
<string>sha1</string>
<string>blake2b</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.73-alpha/webrtc-m114.5735.08.73-alpha.11958809572-windows64-11958809572.tar.zst</string>
<string>https://github.com/AlchemyViewer/3p-webrtc/releases/download/m137.7151.04.20-r8/webrtc-m137.7151.04.20-r8.18457594440-windows64-18457594440.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -2473,7 +2441,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>copyright</key>
<string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string>
<key>version</key>
<string>m114.5735.08.73-alpha.11958809572</string>
<string>m137.7151.04.20-r8.18457594440</string>
<key>name</key>
<string>webrtc</string>
<key>canonical_repo</key>
Expand Down
5 changes: 2 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ pre_build()

if [[ "$arch" == "Darwin" ]]
then
HAVOK=OFF
SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
"-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
fi
Expand Down Expand Up @@ -289,8 +288,8 @@ build()
done
fi

# *TODO: Make this a build extension.
package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
# *TODO: Make this a build extension. disabled for now
# package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
end_section "extensions $variant"

else
Expand Down
9 changes: 8 additions & 1 deletion indra/cmake/LLPhysicsExtensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ if (HAVOK)
include(Havok)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
if(DARWIN)
set(LLPHYSICSEXTENSIONS_STUB_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
# can't set these library dependencies per-arch here, need to do it using XCODE_ATTRIBUTE_OTHER_LDFLAGS[arch=*] in newview/CMakeLists.txt
#target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
#target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensionsstub)
else()
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
endif()
target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
elseif (HAVOK_TPV)
use_prebuilt_binary(llphysicsextensions_tpv)
Expand Down
1 change: 0 additions & 1 deletion indra/llrender/llrender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@ void LLTexUnit::setTextureFilteringOptionFast(LLTexUnit::eTextureFilterOptions o
{
F32 aniso_level = llclamp(LLRender::sAnisotropicFilteringLevel, 1.f, gGLManager.mMaxAnisotropy);
glTexParameterf(sGLTextureType[tex_type], GL_TEXTURE_MAX_ANISOTROPY, aniso_level);

}
else
{
Expand Down
2 changes: 1 addition & 1 deletion indra/llwebrtc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if (WINDOWS)
iphlpapi
libcmt)
# as the webrtc libraries are release, build this binary as release as well.
target_compile_options(llwebrtc PRIVATE "/MT")
target_compile_options(llwebrtc PRIVATE "/MT" "/Zc:wchar_t")
if (USE_BUGSPLAT)
set_target_properties(llwebrtc PROPERTIES PDB_OUTPUT_DIRECTORY "${SYMBOLS_STAGING_DIR}")
endif (USE_BUGSPLAT)
Expand Down
Loading
Loading