From e3d15a9146d375368066cdbcf2a45f40165175f1 Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Tue, 12 Aug 2025 09:02:07 -0700 Subject: 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 --- etc/message.xml | 751 --------------------------------- indra/newview/CMakeLists.txt | 4 +- indra/newview/app_settings/message.xml | 751 +++++++++++++++++++++++++++++++++ indra/newview/viewer_manifest.py | 1 - 4 files changed, 753 insertions(+), 754 deletions(-) delete mode 100755 etc/message.xml create mode 100755 indra/newview/app_settings/message.xml diff --git a/etc/message.xml b/etc/message.xml deleted file mode 100755 index dee3fd72dd..0000000000 --- a/etc/message.xml +++ /dev/null @@ -1,751 +0,0 @@ - - - - serverDefaults - - - simulator - template - - spaceserver - template - - dataserver - template - - logDataserver - template - - inventoryDataserver - template - - rpcserver - template - - mapserver - template - - viewer - template - - - messages - - - - PacketAck - - flavor - template - trusted-sender - false - - - OpenCircuit - - flavor - llsd - trusted-sender - false - - - CloseCircuit - - flavor - template - trusted-sender - false - - - StartPingCheck - - flavor - template - trusted-sender - false - - - CompletePingCheck - - flavor - template - trusted-sender - false - - - AddCircuitCode - - flavor - template - trusted-sender - true - - - UseCircuitCode - - flavor - template - trusted-sender - false - - - CreateTrustedCircuit - - flavor - template - trusted-sender - false - - - RequestTrustedCircuit - - flavor - template - trusted-sender - true - - - - ReportAutosaveCrash - - flavor - template - trusted-sender - false - - - SetCPURatio - - flavor - template - trusted-sender - false - - - - CompleteAgentMovement - - flavor - template - trusted-sender - false - - - EconomyDataRequest - - flavor - template - trusted-sender - false - - - ViewerEffect - - flavor - template - trusted-sender - false - - - RegionHandshakeReply - - flavor - template - trusted-sender - false - - - - AgentUpdate - - flavor - template - trusted-sender - false - - - - ImagePacket - - flavor - template - trusted-sender - false - - - LayerData - - flavor - template - trusted-sender - false - - - ObjectUpdateCached - - flavor - template - trusted-sender - false - - - ObjectUpdateCompressed - - flavor - template - trusted-sender - false - - - ObjectUpdate - - flavor - template - trusted-sender - false - - - ImprovedTerseObjectUpdate - - flavor - template - trusted-sender - false - - - AvatarAnimation - - flavor - template - trusted-sender - false - - - ObjectAnimation - - flavor - template - trusted-sender - false - - - AvatarAppearance - - flavor - template - trusted-sender - false - - - - GodKickUser - - flavor - llsd - trusted-sender - false - - - RoutedMoneyBalanceReply - - flavor - llsd - trusted-sender - false - - - - EdgeDataPacket - - flavor - template - trusted-sender - true - - - CoarseLocationUpdate - - flavor - template - trusted-sender - true - only-send-latest - true - - - SimulatorLoad - - flavor - template - trusted-sender - true - - - EstablishAgentCommunication - - flavor - llsd - trusted-sender - true - - - AgentGroupDataUpdate - - flavor - llsd - trusted-sender - true - - - AgentDropGroup - - flavor - llsd - trusted-sender - true - - - ChatterBoxSessionStartReply - - flavor - llsd - trusted-sender - true - - - ChatterBoxSessionEventReply - - flavor - llsd - trusted-sender - true - - - ForceCloseChatterBoxSession - - flavor - llsd - trusted-sender - true - - - ChatterBoxSessionAgentListUpdates - - flavor - llsd - trusted-sender - true - - - ChatterBoxSessionUpdate - - flavor - llsd - trusted-sender - true - - - ChatterBoxInvitation - - flavor - llsd - trusted-sender - true - - - - ParcelVoiceInfoRequest - - flavor - llsd - trusted-sender - false - - - - DisplayNameUpdate - - flavor - llsd - trusted-sender - true - - - ParcelVoiceInfo - - flavor - llsd - trusted-sender - true - - - ParcelNavigateMedia - - flavor - llsd - trusted-sender - false - - - ParcelObjectOwnersReply - - flavor - llsd - trusted-sender - true - - - ParcelProperties - - flavor - llsd - trusted-sender - true - - - LandStatReply - - flavor - llsd - trusted-sender - true - - - PlacesReply - - flavor - llsd - trusted-sender - true - - - SetDisplayNameReply - - flavor - llsd - trusted-sender - true - - - SimConsoleResponse - - flavor - llsd - trusted-sender - true - - - DirLandReply - - flavor - llsd - trusted-sender - true - - - avatarnotesrequest - - service_name - avatar-notes - builder - template - trusted-sender - false - - - avatarclassifiedsrequest - - service_name - avatar-classifieds - builder - template - trusted-sender - false - - - avatarpicksrequest - - service_name - avatar-pick - builder - template - trusted-sender - false - - - pickinforequest - - service_name - pick-info - builder - template - trusted-sender - false - - - ProvisionVoiceAccountRequest - - flavor - llsd - trusted-sender - false - - - VoiceSignalingRequest - - flavor - llsd - trusted-sender - false - - - RequiredVoiceVersion - - flavor - llsd - trusted-sender - true - - - EnableSimulator - - flavor - llsd - trusted-sender - true - - - TeleportFinish - - flavor - llsd - trusted-sender - true - - - TeleportFailed - - flavor - llsd - trusted-sender - true - - - CrossedRegion - - flavor - llsd - trusted-sender - true - - - NavMeshStatusUpdate - - flavor - llsd - trusted-sender - true - - - AgentStateUpdate - - flavor - llsd - trusted-sender - true - - - - ScriptRunningReply - - flavor - llsd - trusted-sender - false - - - LandStatReply - - flavor - llsd - trusted-sender - false - - - StartGroupProposal - - flavor - llsd - trusted-sender - false - - - FetchInventoryDescendents - - flavor - template - trusted-sender - false - - - GroupProposalBallot - - flavor - llsd - trusted-sender - false - - - RpcScriptRequestInboundForward - - flavor - llsd - trusted-sender - false - - - ObjectPhysicsProperties - - flavor - llsd - trusted-sender - true - - - - capBans - - MapLayer - false - - MapLayerGod - false - - NewFileAgentInventory - false - - UpdateGestureAgentInventory - false - - UpdateNotecardAgentInventory - false - - UpdateScriptAgentInventory - false - - UpdateGestureTaskInventory - false - - UpdateNotecardTaskInventory - false - - UpdateScriptTaskInventory - false - - ViewerStartAuction - true - - ParcelGodReserveForNewbie - true - - SendUserReport - false - - SendUserReportWithScreenshot - false - - RequestTextureDownload - true - - EventQueueGet - false - - UntrustedSimulatorMessage - false - - SendPostcard - false - - SendPostcard2 - true - - SendPostcard3 - true - - ParcelVoiceInfoRequest - false - - ChatSessionRequest - false - - ProvisionVoiceAccountRequest - false - - VoiceSignalingRequest - false - - RemoteParcelRequest - false - - SearchStatTracking - false - - ParcelPropertiesUpdate - false - - EstateChangeInfo - true - - FetchInventoryDescendents2 - false - - FetchInventory2 - false - - FetchLibDescendents2 - false - - FetchLib2 - false - - UploadBakedTexture - true - - ObjectMedia - false - - ObjectMediaNavigate - false - - - - messageBans - - trusted - - - - untrusted - - - - - maxQueuedEvents - 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/indra/newview/app_settings/message.xml b/indra/newview/app_settings/message.xml new file mode 100755 index 0000000000..dee3fd72dd --- /dev/null +++ b/indra/newview/app_settings/message.xml @@ -0,0 +1,751 @@ + + + + serverDefaults + + + simulator + template + + spaceserver + template + + dataserver + template + + logDataserver + template + + inventoryDataserver + template + + rpcserver + template + + mapserver + template + + viewer + template + + + messages + + + + PacketAck + + flavor + template + trusted-sender + false + + + OpenCircuit + + flavor + llsd + trusted-sender + false + + + CloseCircuit + + flavor + template + trusted-sender + false + + + StartPingCheck + + flavor + template + trusted-sender + false + + + CompletePingCheck + + flavor + template + trusted-sender + false + + + AddCircuitCode + + flavor + template + trusted-sender + true + + + UseCircuitCode + + flavor + template + trusted-sender + false + + + CreateTrustedCircuit + + flavor + template + trusted-sender + false + + + RequestTrustedCircuit + + flavor + template + trusted-sender + true + + + + ReportAutosaveCrash + + flavor + template + trusted-sender + false + + + SetCPURatio + + flavor + template + trusted-sender + false + + + + CompleteAgentMovement + + flavor + template + trusted-sender + false + + + EconomyDataRequest + + flavor + template + trusted-sender + false + + + ViewerEffect + + flavor + template + trusted-sender + false + + + RegionHandshakeReply + + flavor + template + trusted-sender + false + + + + AgentUpdate + + flavor + template + trusted-sender + false + + + + ImagePacket + + flavor + template + trusted-sender + false + + + LayerData + + flavor + template + trusted-sender + false + + + ObjectUpdateCached + + flavor + template + trusted-sender + false + + + ObjectUpdateCompressed + + flavor + template + trusted-sender + false + + + ObjectUpdate + + flavor + template + trusted-sender + false + + + ImprovedTerseObjectUpdate + + flavor + template + trusted-sender + false + + + AvatarAnimation + + flavor + template + trusted-sender + false + + + ObjectAnimation + + flavor + template + trusted-sender + false + + + AvatarAppearance + + flavor + template + trusted-sender + false + + + + GodKickUser + + flavor + llsd + trusted-sender + false + + + RoutedMoneyBalanceReply + + flavor + llsd + trusted-sender + false + + + + EdgeDataPacket + + flavor + template + trusted-sender + true + + + CoarseLocationUpdate + + flavor + template + trusted-sender + true + only-send-latest + true + + + SimulatorLoad + + flavor + template + trusted-sender + true + + + EstablishAgentCommunication + + flavor + llsd + trusted-sender + true + + + AgentGroupDataUpdate + + flavor + llsd + trusted-sender + true + + + AgentDropGroup + + flavor + llsd + trusted-sender + true + + + ChatterBoxSessionStartReply + + flavor + llsd + trusted-sender + true + + + ChatterBoxSessionEventReply + + flavor + llsd + trusted-sender + true + + + ForceCloseChatterBoxSession + + flavor + llsd + trusted-sender + true + + + ChatterBoxSessionAgentListUpdates + + flavor + llsd + trusted-sender + true + + + ChatterBoxSessionUpdate + + flavor + llsd + trusted-sender + true + + + ChatterBoxInvitation + + flavor + llsd + trusted-sender + true + + + + ParcelVoiceInfoRequest + + flavor + llsd + trusted-sender + false + + + + DisplayNameUpdate + + flavor + llsd + trusted-sender + true + + + ParcelVoiceInfo + + flavor + llsd + trusted-sender + true + + + ParcelNavigateMedia + + flavor + llsd + trusted-sender + false + + + ParcelObjectOwnersReply + + flavor + llsd + trusted-sender + true + + + ParcelProperties + + flavor + llsd + trusted-sender + true + + + LandStatReply + + flavor + llsd + trusted-sender + true + + + PlacesReply + + flavor + llsd + trusted-sender + true + + + SetDisplayNameReply + + flavor + llsd + trusted-sender + true + + + SimConsoleResponse + + flavor + llsd + trusted-sender + true + + + DirLandReply + + flavor + llsd + trusted-sender + true + + + avatarnotesrequest + + service_name + avatar-notes + builder + template + trusted-sender + false + + + avatarclassifiedsrequest + + service_name + avatar-classifieds + builder + template + trusted-sender + false + + + avatarpicksrequest + + service_name + avatar-pick + builder + template + trusted-sender + false + + + pickinforequest + + service_name + pick-info + builder + template + trusted-sender + false + + + ProvisionVoiceAccountRequest + + flavor + llsd + trusted-sender + false + + + VoiceSignalingRequest + + flavor + llsd + trusted-sender + false + + + RequiredVoiceVersion + + flavor + llsd + trusted-sender + true + + + EnableSimulator + + flavor + llsd + trusted-sender + true + + + TeleportFinish + + flavor + llsd + trusted-sender + true + + + TeleportFailed + + flavor + llsd + trusted-sender + true + + + CrossedRegion + + flavor + llsd + trusted-sender + true + + + NavMeshStatusUpdate + + flavor + llsd + trusted-sender + true + + + AgentStateUpdate + + flavor + llsd + trusted-sender + true + + + + ScriptRunningReply + + flavor + llsd + trusted-sender + false + + + LandStatReply + + flavor + llsd + trusted-sender + false + + + StartGroupProposal + + flavor + llsd + trusted-sender + false + + + FetchInventoryDescendents + + flavor + template + trusted-sender + false + + + GroupProposalBallot + + flavor + llsd + trusted-sender + false + + + RpcScriptRequestInboundForward + + flavor + llsd + trusted-sender + false + + + ObjectPhysicsProperties + + flavor + llsd + trusted-sender + true + + + + capBans + + MapLayer + false + + MapLayerGod + false + + NewFileAgentInventory + false + + UpdateGestureAgentInventory + false + + UpdateNotecardAgentInventory + false + + UpdateScriptAgentInventory + false + + UpdateGestureTaskInventory + false + + UpdateNotecardTaskInventory + false + + UpdateScriptTaskInventory + false + + ViewerStartAuction + true + + ParcelGodReserveForNewbie + true + + SendUserReport + false + + SendUserReportWithScreenshot + false + + RequestTextureDownload + true + + EventQueueGet + false + + UntrustedSimulatorMessage + false + + SendPostcard + false + + SendPostcard2 + true + + SendPostcard3 + true + + ParcelVoiceInfoRequest + false + + ChatSessionRequest + false + + ProvisionVoiceAccountRequest + false + + VoiceSignalingRequest + false + + RemoteParcelRequest + false + + SearchStatTracking + false + + ParcelPropertiesUpdate + false + + EstateChangeInfo + true + + FetchInventoryDescendents2 + false + + FetchInventory2 + false + + FetchLibDescendents2 + false + + FetchLib2 + false + + UploadBakedTexture + true + + ObjectMedia + false + + ObjectMediaNavigate + false + + + + messageBans + + trusted + + + + untrusted + + + + + maxQueuedEvents + 100 + + 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"): -- cgit v1.2.3