livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3760 from secondlife/leviathan/update-message-template-redux 

message_template.msg to agree with master-message-template
master
Jonathan "Geenz" Goodman 2025-03-18 09:25:49 -04:00 committed by GitHub
parent 37b26062cf 1a92e392ea
commit f462037b8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6267 additions and 6119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
scripts/messages/message_template.msg
View File

@ -6,7 +6,7 @@ version 2.0
// numbers. Each message must be numbered relative to the // numbers. Each message must be numbered relative to the
// other messages of that type. The current highest number // other messages of that type. The current highest number
// for each type is listed below: // for each type is listed below:
// Low: 430 // Low: 431
// Medium: 18 // Medium: 18
// High: 30 // High: 30
// PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE! // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
@ -460,7 +460,7 @@ version 2.0
// that a given simulator is present and valid for a set amount of // that a given simulator is present and valid for a set amount of
// time // time
{ {
SetSimPresenceInDatabase Low 23 Trusted Unencoded SetSimPresenceInDatabase Low 23 Trusted Unencoded UDPDeprecated
{ {
SimData Single SimData Single
{ RegionID LLUUID } { RegionID LLUUID }
@ -1553,7 +1553,7 @@ version 2.0
AgentData Single AgentData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ SessionID LLUUID } { SessionID LLUUID }
{ SerialNum U32 } // U32, used by both pause and resume. Non-increasing numbers are ignored. { SerialNum U32 } // used by both pause and resume. Non-increasing numbers are ignored.
} }
} }
@ -1564,7 +1564,7 @@ version 2.0
AgentData Single AgentData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ SessionID LLUUID } { SessionID LLUUID }
{ SerialNum U32 } // U32, used by both pause and resume. Non-increasing numbers are ignored. { SerialNum U32 } // used by both pause and resume. Non-increasing numbers are ignored.
} }
} }
@ -1677,7 +1677,7 @@ version 2.0
AgentData Single AgentData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ SessionID LLUUID } { SessionID LLUUID }
{ SerialNum U32 } // U32, Increases every time the appearance changes. A value of 0 resets. { SerialNum U32 } // Increases every time the appearance changes. A value of 0 resets.
{ Size LLVector3 } { Size LLVector3 }
} }
{ {
@ -1875,7 +1875,7 @@ version 2.0
AgentData Single AgentData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ SessionID LLUUID } { SessionID LLUUID }
{ Force BOOL } // BOOL, god trying to force delete { Force BOOL } // god trying to force delete
} }
{ {
ObjectData Variable ObjectData Variable
@ -2068,7 +2068,6 @@ version 2.0
{ Friction F32 } { Friction F32 }
{ Restitution F32 } { Restitution F32 }
{ GravityMultiplier F32 } { GravityMultiplier F32 }
} }
} }
@ -2107,6 +2106,24 @@ version 2.0
} }
} }
// ObjectBypassModUpdate
// Viewer -> Simulator
// Allows the owner of an object to bypass mod protections for
// Predefined fields.
{
ObjectBypassModUpdate Low 431 NotTrusted Zerocoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
}
{
ObjectData Variable
{ ObjectLocalID U32 }
{ PropertyID U8 }
{ Value Variable 2 }
}
}
{ {
ObjectMaterial Low 97 NotTrusted Zerocoded ObjectMaterial Low 97 NotTrusted Zerocoded
@ -2122,7 +2139,6 @@ version 2.0
} }
} }
{ {
ObjectShape Low 98 NotTrusted Zerocoded ObjectShape Low 98 NotTrusted Zerocoded
{ {
@ -2185,7 +2201,7 @@ version 2.0
} }
{ {
HeaderData Single HeaderData Single
{ Override BOOL } // BOOL, God-bit. { Override BOOL } // God-bit.
{ OwnerID LLUUID } { OwnerID LLUUID }
{ GroupID LLUUID } { GroupID LLUUID }
} }
@ -2256,7 +2272,7 @@ version 2.0
{ {
Data Single Data Single
{ ObjectID LLUUID } { ObjectID LLUUID }
{ Delete BOOL } // BOOL { Delete BOOL }
} }
} }
@ -2274,7 +2290,7 @@ version 2.0
} }
{ {
HeaderData Single HeaderData Single
{ Override BOOL } // BOOL, God-bit. { Override BOOL } // God-bit.
} }
{ {
ObjectData Variable ObjectData Variable
@ -2743,7 +2759,7 @@ version 2.0
{ RunTime F32 } // F32 { RunTime F32 } // F32
{ SimFPS F32 } // F32 { SimFPS F32 } // F32
{ FPS F32 } // F32 { FPS F32 } // F32
{ AgentsInView U8 } // { AgentsInView U8 }
{ Ping F32 } // F32 { Ping F32 } // F32
{ MetersTraveled F64 } { MetersTraveled F64 }
{ RegionsVisited S32 } { RegionsVisited S32 }
@ -2836,6 +2852,8 @@ version 2.0
// AlertMessage // AlertMessage
// Specifies the text to be posted in an alert dialog // Specifies the text to be posted in an alert dialog
// Also sent from dataserver to simulator with AgentInfo block
// Simulator doesn't include AgentInfo block to viewer
{ {
AlertMessage Low 134 Trusted Unencoded AlertMessage Low 134 Trusted Unencoded
{ {
@ -2847,6 +2865,10 @@ version 2.0
{ Message Variable 1 } { Message Variable 1 }
{ ExtraParams Variable 1 } { ExtraParams Variable 1 }
} }
{
AgentInfo Variable
{ AgentID LLUUID }
}
} }
// Send an AlertMessage to the named agent. // Send an AlertMessage to the named agent.
@ -3009,6 +3031,16 @@ version 2.0
{ ChatShoutOffset F32 } { ChatShoutOffset F32 }
{ ChatFlags U32 } { ChatFlags U32 }
} }
{
CombatSettings Variable
{ CombatFlags U32 }
{ OnDeath U8 }
{ DamageThrottle F32 }
{ RegenerationRate F32 }
{ InvulnerabilyTime F32 }
{ DamageLimit F32 }
}
} }
// GodUpdateRegionInfo // GodUpdateRegionInfo
@ -3265,7 +3297,7 @@ version 2.0
{ ObjectData Variable 1 } { ObjectData Variable 1 }
{ ParentID U32 } { ParentID U32 }
{ UpdateFlags U32 } // U32, see object_flags.h { UpdateFlags U32 } // see object_flags.h
{ PathCurve U8 } { PathCurve U8 }
{ ProfileCurve U8 } { ProfileCurve U8 }
@ -3512,8 +3544,8 @@ version 2.0
{ ID U64 } { ID U64 }
{ Filename Variable 1 } { Filename Variable 1 }
{ FilePath U8 } // ELLPath { FilePath U8 } // ELLPath
{ DeleteOnCompletion BOOL } // BOOL { DeleteOnCompletion BOOL }
{ UseBigPackets BOOL } // BOOL { UseBigPackets BOOL }
{ VFileID LLUUID } { VFileID LLUUID }
{ VFileType S16 } { VFileType S16 }
} }
@ -3581,6 +3613,7 @@ version 2.0
} }
} }
// AvatarAppearance - Update visual params // AvatarAppearance - Update visual params
{ {
AvatarAppearance Low 158 Trusted Zerocoded AvatarAppearance Low 158 Trusted Zerocoded
@ -3748,7 +3781,6 @@ version 2.0
} }
{ {
ButtonData Variable ButtonData Variable
{ PayButton S32 } { PayButton S32 }
} }
} }
@ -4368,6 +4400,9 @@ version 2.0
} }
// ScriptTeleportRequest // ScriptTeleportRequest
// Interestingly, this message does not actually "Request a Teleport"
// on the viewer. Instead it opens the world map and places a beacon
// at the indicated location.
// reliable // reliable
{ {
ScriptTeleportRequest Low 195 Trusted Unencoded ScriptTeleportRequest Low 195 Trusted Unencoded
@ -4458,7 +4493,7 @@ version 2.0
// WARNING: This packet is potentially large. With max length name, // WARNING: This packet is potentially large. With max length name,
// description, music URL and media URL, it is 1526 + sizeof ( LLUUID ) bytes. // description, music URL and media URL, it is 1526 + sizeof ( LLUUID ) bytes.
{ {
ParcelProperties High 23 Trusted Zerocoded ParcelProperties High 23 Trusted Zerocoded UDPDeprecated
{ {
ParcelData Single ParcelData Single
{ RequestResult S32 } { RequestResult S32 }
@ -4512,6 +4547,7 @@ version 2.0
{ RegionDenyAnonymous BOOL } { RegionDenyAnonymous BOOL }
{ RegionDenyIdentified BOOL } { RegionDenyIdentified BOOL }
{ RegionDenyTransacted BOOL } { RegionDenyTransacted BOOL }
// in llsd message, SeeAVs, GroupAVSounds and AnyAVSounds BOOLs are also sent
} }
{ {
AgeVerificationBlock Single AgeVerificationBlock Single
@ -5289,6 +5325,10 @@ version 2.0
{ CanAcceptAgents BOOL } { CanAcceptAgents BOOL }
{ CanAcceptTasks BOOL } { CanAcceptTasks BOOL }
} }
{
SimFlags Single
{ Flags U64 }
}
} }
// Child Agent Update - agents send child agents to neighboring simulators. // Child Agent Update - agents send child agents to neighboring simulators.
@ -5318,7 +5358,7 @@ version 2.0
{ AtAxis LLVector3 } { AtAxis LLVector3 }
{ LeftAxis LLVector3 } { LeftAxis LLVector3 }
{ UpAxis LLVector3 } { UpAxis LLVector3 }
{ ChangedGrid BOOL } // BOOL { ChangedGrid BOOL }
{ Far F32 } { Far F32 }
{ Aspect F32 } { Aspect F32 }
@ -5367,6 +5407,10 @@ version 2.0
AgentInfo Variable AgentInfo Variable
{ Flags U32 } { Flags U32 }
} }
{
AgentInventoryHost Variable
{ InventoryHost Variable 1 } //String
}
} }
// ChildAgentAlive // ChildAgentAlive
@ -5668,10 +5712,19 @@ version 2.0
{ Message Variable 2 } { Message Variable 2 }
{ BinaryBucket Variable 2 } { BinaryBucket Variable 2 }
} }
{
EstateBlock Single
{ EstateID U32 }
}
{
MetaData Variable
{ Data Variable 2 }
}
} }
// RetrieveInstantMessages - used to get instant messages that // RetrieveInstantMessages - used to get instant messages that
// were persisted out to the database while the user was offline // were persisted out to the database while the user was offline
// Sent from viewer->simulator. Also see RetrieveIMsExtended (back-end only)
{ {
RetrieveInstantMessages Low 255 NotTrusted Unencoded RetrieveInstantMessages Low 255 NotTrusted Unencoded
{ {
@ -6604,6 +6657,11 @@ version 2.0
{ InventoryID LLUUID } { InventoryID LLUUID }
{ Type S8 } { Type S8 }
} }
{
ValidationBlock Single
{ NeedsValidation BOOL }
{ EstateID U32 }
}
} }
// dataserver -> sim // dataserver -> sim
@ -6920,7 +6978,7 @@ version 2.0
MoneyData Single MoneyData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ TransactionID LLUUID } { TransactionID LLUUID }
{ TransactionSuccess BOOL } // BOOL { TransactionSuccess BOOL }
{ MoneyBalance S32 } { MoneyBalance S32 }
{ SquareMetersCredit S32 } { SquareMetersCredit S32 }
{ SquareMetersCommitted S32 } { SquareMetersCommitted S32 }
@ -6949,7 +7007,7 @@ version 2.0
// dataserver -> simulator -> spaceserver -> simulator -> viewer // dataserver -> simulator -> spaceserver -> simulator -> viewer
// reliable // reliable
{ {
RoutedMoneyBalanceReply Low 315 Trusted Zerocoded RoutedMoneyBalanceReply Low 315 Trusted Zerocoded UDPDeprecated
{ {
TargetBlock Single TargetBlock Single
{ TargetIP IPADDR } // U32 encoded IP { TargetIP IPADDR } // U32 encoded IP
@ -6959,7 +7017,7 @@ version 2.0
MoneyData Single MoneyData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ TransactionID LLUUID } { TransactionID LLUUID }
{ TransactionSuccess BOOL } // BOOL { TransactionSuccess BOOL }
{ MoneyBalance S32 } { MoneyBalance S32 }
{ SquareMetersCredit S32 } { SquareMetersCredit S32 }
{ SquareMetersCommitted S32 } { SquareMetersCommitted S32 }
@ -7348,7 +7406,6 @@ version 2.0
} }
} }
// ************************************************************************* // *************************************************************************
// Object animation messages // Object animation messages
// ************************************************************************* // *************************************************************************
@ -7419,8 +7476,8 @@ version 2.0
{ {
DataBlock Single DataBlock Single
{ ObjectID LLUUID } { ObjectID LLUUID }
{ More U32 } //U32 { More U32 }
{ Time U32 } //U32 { Time U32 }
{ FromAddress Variable 1 } { FromAddress Variable 1 }
{ Subject Variable 1 } { Subject Variable 1 }
{ Data Variable 2 } { Data Variable 2 }
@ -7468,7 +7525,6 @@ version 2.0
// CreateGroupRequest // CreateGroupRequest
// viewer -> simulator // viewer -> simulator
// simulator -> dataserver
// reliable // reliable
{ {
CreateGroupRequest Low 339 NotTrusted Zerocoded CreateGroupRequest Low 339 NotTrusted Zerocoded
@ -7483,8 +7539,8 @@ version 2.0
{ Charter Variable 2 } // string { Charter Variable 2 } // string
{ ShowInList BOOL } { ShowInList BOOL }
{ InsigniaID LLUUID } { InsigniaID LLUUID }
{ MembershipFee S32 } // S32 { MembershipFee S32 }
{ OpenEnrollment BOOL } // BOOL (U8) { OpenEnrollment BOOL }
{ AllowPublish BOOL } // whether profile is externally visible or not { AllowPublish BOOL } // whether profile is externally visible or not
{ MaturePublish BOOL } // profile is "mature" { MaturePublish BOOL } // profile is "mature"
} }
@ -7687,6 +7743,10 @@ version 2.0
{ RoleID LLUUID } { RoleID LLUUID }
{ MembershipFee S32 } { MembershipFee S32 }
} }
{
GroupData Single
{ GroupLimit S32 } // Extra block for the agent's group limit
}
} }
// GroupProfileRequest // GroupProfileRequest
@ -7721,11 +7781,11 @@ version 2.0
{ Charter Variable 2 } // string { Charter Variable 2 } // string
{ ShowInList BOOL } { ShowInList BOOL }
{ MemberTitle Variable 1 } // string { MemberTitle Variable 1 } // string
{ PowersMask U64 } // U32 mask { PowersMask U64 }
{ InsigniaID LLUUID } { InsigniaID LLUUID }
{ FounderID LLUUID } { FounderID LLUUID }
{ MembershipFee S32 } { MembershipFee S32 }
{ OpenEnrollment BOOL } // BOOL (U8) { OpenEnrollment BOOL }
{ Money S32 } { Money S32 }
{ GroupMembershipCount S32 } { GroupMembershipCount S32 }
{ GroupRolesCount S32 } { GroupRolesCount S32 }
@ -7993,8 +8053,8 @@ version 2.0
ProposalData Single ProposalData Single
{ GroupID LLUUID } { GroupID LLUUID }
{ Quorum S32 } { Quorum S32 }
{ Majority F32 } // F32 { Majority F32 }
{ Duration S32 } // S32, seconds { Duration S32 } // seconds
{ ProposalText Variable 1 } // string { ProposalText Variable 1 } // string
} }
} }
@ -8313,13 +8373,13 @@ version 2.0
AgentData Single AgentData Single
{ AgentID LLUUID } { AgentID LLUUID }
{ SessionID LLUUID } { SessionID LLUUID }
{ SerialNum U32 } // U32, Increases every time the wearables change for a given agent. Used to avoid processing out of order packets. { SerialNum U32 } // Increases every time the wearables change for a given agent. Used to avoid processing out of order packets.
} }
{ {
WearableData Variable WearableData Variable
{ ItemID LLUUID } { ItemID LLUUID }
{ AssetID LLUUID } { AssetID LLUUID }
{ WearableType U8 } // U8, LLWearable::EWearType { WearableType U8 } // LLWearable::EWearType
} }
} }
@ -9137,3 +9197,91 @@ version 2.0
} }
} }
// RetrieveIMsExtended - extended version of RetrieveInstantMessages,
// used to get instant messages that were persisted out to the database while the user was offline
// sent between the simulator and dataserver
{
RetrieveIMsExtended Low 427 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ IsPremium BOOL }
}
}
// JoinGroupRequestExtended
// Extends JoinGroupRequest from viewer and passed to dataserver
// simulator -> dataserver
// reliable
{
JoinGroupRequestExtended Low 428 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ GroupLimit S32 }
}
{
GroupData Single
{ GroupID LLUUID }
}
}
// CreateGroupRequestExtended
// simulator -> dataserver, extends data from CreateGroupRequest
// reliable
{
CreateGroupRequestExtended Low 429 Trusted Unencoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
{ GroupLimit S32 }
}
{
GroupData Single
{ Name Variable 1 } // string
{ Charter Variable 2 } // string
{ ShowInList BOOL }
{ InsigniaID LLUUID }
{ MembershipFee S32 }
{ OpenEnrollment BOOL }
{ AllowPublish BOOL } // whether profile is externally visible or not
{ MaturePublish BOOL } // profile is "mature"
}
}
// viewer -> simulator
// GameControlInput - input from game controller
// The main payload of this message is split into two Variable chunks:
//
// AxisData = list of {Index:Value} pairs. Value is an S16 that maps to range [-1, 1]
// ButtonData = list of indices of pressed buttons
//
// Any Axis ommitted from the message is assumed by the receiving Simulator to be unchanged
// from its previously received value.
//
// Any Button omitted from the message is assumed by the receiving Simulator to be unpressed.
//
// GameControlInput messages are sent unreliably, but when input changes stop the last
// message will be resent at a ever increasing period to make sure the server receives it.
//
{
GameControlInput High 32 NotTrusted Zerocoded
{
AgentData Single
{ AgentID LLUUID }
{ SessionID LLUUID }
}
{
AxisData Variable
{ Index U8 }
{ Value S16 }
}
{
ButtonData Variable
{ Data Variable 1 }
}
}

2
scripts/messages/message_template.msg.sha1
View File

@ -1 +1 @@
b98fc0af5fa88601f5afa4f3c83f08188316e9a8 aaecaf01b6954c156662f572dc3ecaf26de0ca67