viewer.git/indra/newview/llviewerassetupload.cpp, branch 26.4

Merge branch 'release/26.3' into marchcat/slua-26.3

2026-07-16T16:22:02Z

# Conflicts: # .github/workflows/build.yaml # autobuild.xml # indra/llcommon/llsys.cpp # indra/llrender/llimagegl.cpp # indra/llrender/llimagegl.h # indra/newview/CMakeLists.txt # indra/newview/featuretable.txt # indra/newview/featuretable_linux.txt # indra/newview/featuretable_mac.txt # indra/newview/llvoavatar.cpp # indra/newview/llvoiceclient.cpp # indra/newview/llvoicevivox.cpp # indra/newview/viewer_manifest.py

#4094 Handle two stage uploads more reliably

2026-07-03T13:15:04Z

Merge branch 'develop-linux' into project/lua_editor

2026-01-20T01:56:38Z

# Conflicts: # indra/newview/llpreviewscript.cpp

#4899 Fix erros related to negative file size

2026-01-07T00:15:43Z

Reapply "Add more functionality to LLFile and cleanup LLAPRFile""

2026-01-07T00:15:43Z

# Conflicts: # indra/llcrashlogger/llcrashlock.cpp # indra/llrender/llshadermgr.cpp # indra/test/CMakeLists.txt

Revert #4899 "Add more functionality to LLFile and cleanup LLAPRFile"

2025-12-10T23:42:52Z

Interferes with linux work, will be moved to a different branch and applied separately.

Fix typo found by Copilot

2025-12-10T18:33:58Z

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Generate error if the asset upload is bigger than INT_MAX as recommended by Copilot

2025-12-10T18:33:58Z

Add a new static function LLFile::size() to determine the size of a file_name.

2025-12-10T18:33:58Z

Replace LLAPRFile::remove(), LLAPRFile::size() and LLAPRFile::isExist() with according functions from LLFile and retire these LLAPRFile methods and the never used LLAPRFile::rename(), LLAPRFile::makeDir() and LLAPRFile::removeDir() functions. Also clean up remarks about the threading safety of the APRCachePool, which is not used in these locations anymore.

Merge branch 'develop-linux' into marchcat/slua-linux

2025-12-03T20:30:28Z

# Conflicts: # indra/newview/llfeaturemanager.cpp