Ansariel 5b57ccd4a6 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llslurl.cpp # scripts/messages/message_template.msg.sha1		2023-10-18 10:32:59 +02:00
..
message_template.msg	Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer	2023-10-18 10:32:59 +02:00
message_template.msg.sha1	Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer	2023-10-18 10:32:59 +02:00