From e3d15a9146d375368066cdbcf2a45f40165175f1 Mon Sep 17 00:00:00 2001
From: Signal Linden <signal@lindenlab.com>
Date: Tue, 12 Aug 2025 09:02:07 -0700
Subject: [PATCH] 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
---
 indra/newview/CMakeLists.txt                    | 4 ++--
 {etc => indra/newview/app_settings}/message.xml | 0
 indra/newview/viewer_manifest.py                | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename {etc => indra/newview/app_settings}/message.xml (100%)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 759a40fc08..8ed7876da1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1664,7 +1664,7 @@ set(viewer_APPSETTINGS_FILES
     app_settings/toolbars.xml
     app_settings/trees.xml
     app_settings/viewerart.xml
-    ${CMAKE_SOURCE_DIR}/../etc/message.xml
+    app_settings/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
     packages-info.txt
     featuretable.txt
@@ -1758,7 +1758,7 @@ if (WINDOWS)
 
     set(COPY_INPUT_DEPENDENCIES
       # The following commented dependencies are determined at variably at build time. Can't do this here.
-      ${CMAKE_SOURCE_DIR}/../etc/message.xml
+      app_settings/message.xml
       ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
       ${SHARED_LIB_STAGING_DIR}/openjp2.dll
       ${SHARED_LIB_STAGING_DIR}/llwebrtc.dll
diff --git a/etc/message.xml b/indra/newview/app_settings/message.xml
similarity index 100%
rename from etc/message.xml
rename to indra/newview/app_settings/message.xml
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 04c3fea93a..cf5e748513 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -63,7 +63,6 @@ class ViewerManifest(LLManifest):
     def construct(self):
         super(ViewerManifest, self).construct()
         self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
-        self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
 
         if self.is_packaging_viewer():
             with self.prefix(src_dst="app_settings"):