| Age | Commit message (Collapse) | Author |
|---|
|
Merge branch 'main' into release/2025.03
|
|
|
|
|
|
|
|
since we started using more recent patch versions of LL's Collada DOM
fork.
|
|
* #3409 Make probe count adjustable to better accomodate low VRAM scenarios
|
|
|
|
|
|
|
|
|
|
The viewer now prefers to load inventory via the capability rather than
over the deprecated Xfer system, though both are still supported.
# Conflicts:
# indra/newview/llviewerobject.h
|
|
attachment list gets filled with object ids, not attachment ids
|
|
# Conflicts:
# indra/llxml/llxmltree.cpp
|
|
|
|
delete once per session, not once per instance
# Conflicts:
# indra/newview/llviewermedia.cpp
|
|
# Conflicts:
# indra/newview/llviewermedia.cpp
|
|
Found by running with -fsanitze=thread
Suggestion to avoid accessing invalid memory:
In both cases memory will be allocated by can be accessed beyond bounds.
In LLPolyMesh it can be off by at least one (+x%2). Though I am not even sure if even in best case it always will be a multiple of 16.
In LLViewerJointMesh::updateFaceData the code tries to account for padding by, but the allocation in LLPolyMeshSharedData::allocateVertexData is done without any padding. Thus the sizes must not match.
Replacing the calls with memcpy as a quick fix to see if the error goes away fixed address sanitzer complaining.
It is up to debate if memcpy is a good replacement. LLVector4a::memcpyNonAliased16 was invented for performance. But on the other hand one could argue that nowadays every stdlib maintainer will very heavily optmize functions like memcpy themselves and could take advantage of CPU features the old LL implementation does not take into account.
AVX comes to mind. In any case did I not measure any of this.
|
|
Marketplace deliberately doesn't allow creating folders and the "New
folder from selected" is a way of creating a new folder then moving
selected items inside, therefore shouldn't be allowed.
|
|
|
|
The Collada DOM upstream patch version is one that doesn't depend on PCRE
anymore anyway.
|
|
# Conflicts:
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
|
|
Ensure folder creation callbacks remain alive
# Conflicts:
# indra/newview/llfloatercreatelandmark.cpp
# indra/newview/llfloatercreatelandmark.h
|
|
# Conflicts:
# indra/newview/llfilepicker.cpp
|
|
Second Life's SOCKS5 proxy has been broken on windows for at least six
years due to a conflation of milliseconds and microseconds in the APR
timeout value used when attempting to ping the proxy.
# Conflicts:
# indra/llmessage/llproxy.cpp
|
|
|
|
# Conflicts:
# indra/newview/llphysicsshapebuilderutil.cpp
|
|
# Conflicts:
# indra/newview/llviewermedia.cpp
|
|
|
|
# Conflicts:
# indra/newview/llfloateremojipicker.cpp
# indra/newview/skins/default/xui/en/floater_fast_timers.xml
|
|
# Conflicts:
# indra/newview/lloutfitslist.cpp
|
|
|
|
and therefore LL's Collada DOM can be upgraded to something newer
than r4, and therefore PCRE can be no longer depended on.
Have to set the C++ standard so it doesn't use anything old, but
also it wasn't ready for something as new as C++20 yet, that's why
it's explicitly set to C++17.
Have to set the architecture too when you're cross-compiling,
it would use the native architecture.
|
|
|
|
which isn't used anyway in that file, and differs in parameter
qualifiers, which caused a crash (only) on Ubuntu 24.x, with errors:
Fragment info
-------------
0(857) : error c1106: overloaded function declaration "samplereflectionprobeslegacy" differs only in parameter qualifiers
2025-03-09T07:51:26Z WARNING # llrender/llglslshader.cpp(513) createShader : Failed to link shader: Water Shader
2025-03-09T07:51:26Z WARNING # llrender/llglslshader.cpp(518) createShader : Failed to link using shader level 3 trying again using shader level 2
Vertex info
-----------
0(107) : error C3002: call to undefined function "void calcAtmospherics(vec3);"
|
|
since they upgraded to 1.3.83 from stable 1.2.7 and there seem to be API
changes and we're not ready for them yet.
|
|
|
|
|
|
#3569 Pull in some fixes from forevermac
|
|
2024.12 ForeverFPS
|
|
Fix preferences search not finding text defined in text boxes (#3653)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Cherry-picking develop fixes into 2025.03
|
|
update & include new libboost packages
|
|
|
|
|
