viewer.git/indra/newview/skins/default/xui/zh, branch mainMegapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=main2026-09-17T20:52:56ZRevert #5856 OS hibernation prevention (#6340)2026-09-17T20:52:56ZAndrey Lihatskiy118752495+marchcat@users.noreply.github.com2026-09-17T20:52:56Zurn:sha1:f767219366b8dbaeea95a22bd9953a587f473298#5935 Objects should not show error messages on new line2026-09-09T15:37:58ZAndrey Kleshchev117672381+akleshchev@users.noreply.github.com2026-09-08T21:41:36Zurn:sha1:343e8259543e2fafae05dd3e087bb8145ecfae92
Objects do not support new line in description field
Merge branch 'geenz/linux-to-develop' into marchcat/lua-linux-develop2026-08-13T01:19:15ZAndrey Lihatskiyalihatskiy@productengine.com2026-08-13T01:19:15Zurn:sha1:f376c52ee2a22b3b58263d86566394e80626fc1a
# Conflicts:
# .github/workflows/build.yaml
# indra/llinventory/llinventory.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
p575 Fix wrong text field type in locales2026-06-08T21:26:52ZAndrey Kleshchev117672381+akleshchev@users.noreply.github.com2026-06-06T12:48:51Zurn:sha1:2e2d978c97ea4cf5c427f2346f50a8815523a226#5856 Localize OS hibernation preference strings across locales2026-06-03T22:31:21Zcopilot-swe-agent[bot]198982749+Copilot@users.noreply.github.com2026-06-02T16:00:46Zurn:sha1:5543a2a6cb5d4b2405f5f2d581c3917a0f60b8f8#3430 Strip the 'inside an object' from message as it is not object specific2026-05-22T16:20:42ZAndrey Kleshchev117672381+akleshchev@users.noreply.github.com2026-05-22T16:20:42Zurn:sha1:e63651672fe66fe2c60bfb6c823fe78ed6f1b28dMerge branch 'main' into marchcat/slua-26.22026-05-21T16:37:15ZAndrey Lihatskiyalihatskiy@productengine.com2026-05-21T16:37:15Zurn:sha1:15d82beb6056fa16a1ea1cbf01c5d673a95e0267
# Conflicts:
# indra/llfilesystem/lldir.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lltexturecache.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
Merge branch 'develop' into geenz/26.3-to-develop2026-05-20T16:05:18ZJonathan "Geenz" Goodmangeenz@lindenlab.com2026-05-20T16:05:18Zurn:sha1:40cd1617a6a663fb921265101307454b490ec4ba#3430 Fix incorectly stated permissions for scripts.2026-05-15T18:58:16ZAndrey Kleshchev117672381+akleshchev@users.noreply.github.com2026-05-15T18:58:16Zurn:sha1:4cf0f55c6b1b72084544d087e76bfd72c27d9f8eRemove Guidebook entry points2026-04-21T18:51:59ZMaycon Bekkersmayconbekkers@gmail.com2026-04-14T20:13:36Zurn:sha1:e03869c4482bdfab1b8b5a3170f96bcd8c4e2a3a