viewer.git/indra/llui/llscrolllistctrl.cpp, branch 26.4Megapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=26.42026-01-20T01:56:38ZMerge branch 'develop-linux' into project/lua_editor2026-01-20T01:56:38ZAndrey Lihatskiyalihatskiy@productengine.com2026-01-20T01:56:38Zurn:sha1:30e7621140a3cbf4c911f596c1325f4b7eae25a6
# Conflicts:
# indra/newview/llpreviewscript.cpp
#5138 fix multi column comboboxes not honoring width parameter2025-12-10T19:37:24ZZi Ree81702435+zi-ree@users.noreply.github.com2025-12-10T19:37:24Zurn:sha1:dbbce566e7d66c907dde7bd6c4212b0954b9a5e1Merge branch 'develop-linux' into marchcat/slua-linux2025-12-03T20:30:28ZAndrey Lihatskiyalihatskiy@productengine.com2025-12-03T20:30:28Zurn:sha1:3021e1959ec32192e03e8e210db4b174250c87e2
# Conflicts:
# indra/newview/llfeaturemanager.cpp
#5078 Replace boost::function with std::function2025-12-01T10:46:57ZRyerye@alchemyviewer.org2025-12-01T10:46:57Zurn:sha1:fb3f0e18a2ada57f98c3b10fab0c13fb2d504ae1
* 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 <rye@alchemyviewer.org>Merge tag 'Second_Life_Release#37a04baf-2025.06' into project/lua_editor2025-08-23T17:27:46ZRider Lindenrider@lindenlab.com2025-08-23T17:27:46Zurn:sha1:375158eb6450a0291ec1a0f55714fbf19a8287ebMerge branch 'main' into marchcat/slua-editor-merge2025-05-28T18:11:23ZAndrey Lihatskiyalihatskiy@productengine.com2025-05-28T18:11:23Zurn:sha1:d3bd73ab923b8010bb395505b95bcc38b661162e
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llpreviewscript.h
#4110 Crash on LLScrollListCtrl::deleteSelectedItems2025-05-22T16:41:17ZAndrey Kleshchevandreykproductengine@lindenlab.com2025-05-20T13:20:56Zurn:sha1:0129106bdf80aa7bfb897e39a32045daf2cc471c#3778 #3654 Split text and background selection colors2025-03-21T07:39:25ZAndrey Kleshchevandreykproductengine@lindenlab.com2025-03-20T17:37:25Zurn:sha1:d2dd881a5c840b5132396d6e8353b38b79d69e23#3654 Searchable disabled settings not readable when highlighted2025-03-06T06:50:53ZAndrey Kleshchevandreykproductengine@lindenlab.com2025-03-05T21:00:47Zurn:sha1:616547993a6ad3135987d75eca9f753438984985#3423 Add Lua as Compile Target in Viewer Script Editor2025-01-25T02:02:29ZAlexander Gavriliukalexandrgproductengine@lindenlab.com2025-01-23T23:26:00Zurn:sha1:7f88aedbc3b53496bc99d8e0e64a818c7a3f6d6f