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

#5900 Fix material editor lockup when saving from object to inventory

2026-06-09T15:46:26Z

#5078 Replace boost::function with std::function

2025-12-01T10:46:57Z

* Replace boost::function usage with std::function for easier debugging and reduced compiler warnings * Remove a few remaining instances of boost::noncopyable that were missed in tests Signed-off-by: Rye

#5026 Upload To Folder feature not working

2025-11-21T12:14:45Z

Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac

2025-08-20T22:04:55Z

Merge branch develop into 2025.06

2025-08-06T13:05:19Z

# Conflicts: # indra/newview/llvoavatar.cpp

#4318 Warn or log when texture gets scaled down

2025-07-22T16:16:26Z

for material and model upload

#4313 Improved naming of textures

2025-07-02T16:31:26Z

#4118 Allow Bulk Upload to initialize on Bulk Upload All option

2025-05-22T11:58:13Z

Merge branch 'release/2025.04' into rye/forevermac

2025-04-15T17:55:01Z

Merge branch 'main' into marchcat/maint-c-restore

2025-04-15T16:31:20Z

# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp