Commit Graph

2 Commits (431b3b0c6dc4e5ab07ff3cefd9b21de5580f6902)

Author SHA1 Message Date
Ansariel b0b8328c5c Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llrendertarget.cpp
#	indra/newview/gltf/asset.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoicewebrtc.cpp
#	indra/newview/viewer_manifest.py
2025-08-12 22:50:51 +02:00
Signal Linden e3d15a9146
Chore: Move message.xml to scripts/messages (#4501)
* Move message.xml to scripts/messages

Get rid of the top-level etc/ directory by moving its only contents: message.xml to scripts/messages

* Move message.xml to app_settings

* Remove unneeded inclusion in viewer_manifest.py
2025-08-12 09:02:07 -07:00