And the actual diff file.
--- message_template-siva.msg Mon Sep 25 17:59:41 2006 +++ message_template.msg Tue Oct 03 13:00:41 2006 @@ -119,17 +119,6 @@ } } -// user->viewer -// AssignCircuitCode - Tells the recipient's messaging system what it's code is -//{ -// AssignCircuitCode Low Trusted Unencoded -// { -// CircuitCode Single -// { Code U32 } -// { SessionID LLUUID } -// } -//} - // space->sim // sim->sim // AddCircuitCode - Tells the recipient's messaging system that this code @@ -144,17 +133,6 @@ } } -// sim->space -// Tells the spaceserver that the simulator is ready to receive an -// agent with that circuit code. -//{ -// AckAddCircuitCode Low Trusted Unencoded -// { -// CircuitCode Single -// { Code U32 } -// } -//} - // viewer->sim // UseCircuitCode - Attempts to provide the recipient with IP and Port // info. In the case of viewers, the id is the session id. For other @@ -297,48 +275,6 @@ } } -// AgentIDReply -// dataserver -> simulator -// reliable -// Message send from spaceserver to simulator -// containing agent id for a given session id -// Also, a list of name value pairs for that agent -// also tacked on a list of agents that have granted you powers -//{ -// AgentIDReply Low Trusted Zerocoded -// { -// ReplyBlock Single -// { RequestID LLUUID } -// { SessionID LLUUID } -// { AgentID LLUUID } -// { StartLocation LLVector3 } // Vector3, region local -// { StartLookAt LLVector3 } // Vector3, normalized -// { GroupID LLUUID } -// { GroupOfficer BOOL } -// { AgentAccess U8 } -// { GodLevel U8 } -// { GroupTitle Variable 1 } // string -// } -// { -// TextureData Variable -// { TextureID LLUUID } -// } -// { -// GranterBlock Variable -// { GranterID LLUUID } -// } -// { -// NameValueBlock Variable -// { NameValue Variable 2 } -// } -// { -// AttachmentBlock Variable -// { AttachmentPoint U8 } -// { ItemID LLUUID } -// { AssetID LLUUID } -// } -//} - // AvatarTextureUpdate // simulator -> dataserver // reliable @@ -448,7 +384,7 @@ // sim -> viewer // reliable { - TelehubInfo Low NotTrusted Unencoded + TelehubInfo Low Trusted Unencoded { TelehubBlock Single { ObjectID LLUUID } // null if no telehub @@ -518,19 +454,6 @@ SimulatorShutdownRequest Low Trusted Unencoded } - -// AgentIDRequest -// Request to report agent ID associated with a session id -//{ -// AgentIDRequest Low Trusted Unencoded -// { -// RequestBlock Single -// { RequestID LLUUID } -// { SessionID LLUUID } -// { LocationID U32 } // 0 = last location -// { Godlike BOOL } -// } -//} // **************************************************************************** // Presense messages // **************************************************************************** @@ -685,6 +608,18 @@ } } +// Disabled feature response message +{ + FeatureDisabled Low Trusted Unencoded + { + FailureInfo Single + { ErrorMessage Variable 1 } + { AgentID LLUUID } + { TransactionID LLUUID } + } +} + + // record lost money transactions. This message could be generated // from either the simulator or the dataserver, depending on how // the transaction failed. @@ -894,7 +829,7 @@ // global x,y,z. Otherwise, use center of the AABB. // reliable { - PlacesReply Low NotTrusted Zerocoded + PlacesReply Low Trusted Zerocoded { AgentData Single { AgentID LLUUID } @@ -1007,7 +942,7 @@ // global x,y,z. Otherwise, use center of the AABB. // reliable { - DirPlacesReply Low NotTrusted Zerocoded + DirPlacesReply Low Trusted Zerocoded { AgentData Single { AgentID LLUUID } @@ -1839,11 +1774,10 @@ // TeleportProgress sim->viewer // Tell the agent how the teleport is going. { - TeleportProgress Low NotTrusted Unencoded + TeleportProgress Low Trusted Unencoded { AgentData Single { AgentID LLUUID } - { SessionID LLUUID } } { Info Single @@ -2101,42 +2035,6 @@ } } -// viewer->sim -// request a connection to the userserver -//{ -// RequestUserserverConnection Low NotTrusted Unencoded -// { -// AgentInfo Single -// { AgentID LLUUID } -// { SessionID LLUUID } -// } -//} - -// sim->space->userserver -//{ -// UserserverConnectionForAgent Low Trusted Unencoded -// { -// AgentInfo Single -// { AgentID LLUUID } -// { SessionID LLUUID } -// } -//} - -// userserver->space->sim->agent -//{ -// UserserverReadyForAgent Low Trusted Unencoded -// { -// AgentInfo Single -// { AgentID LLUUID } -// { SessionID LLUUID } -// } -// { -// HostInfo Single -// { ServerIP IPADDR } -// { ServerPort IPPORT } -// } -//} - // Undo { Undo Low NotTrusted Unencoded @@ -2174,6 +2072,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } } @@ -2184,6 +2083,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } } @@ -2205,7 +2105,7 @@ { AgentPause Low NotTrusted Unencoded { - Sender Single + AgentData Single { AgentID LLUUID } { SessionID LLUUID } { SerialNum U32 } // U32, used by both pause and resume. Non-increasing numbers are ignored. @@ -2216,7 +2116,7 @@ { AgentResume Low NotTrusted Unencoded { - Sender Single + AgentData Single { AgentID LLUUID } { SessionID LLUUID } { SerialNum U32 } // U32, used by both pause and resume. Non-increasing numbers are ignored. @@ -2237,7 +2137,8 @@ AgentUpdate High NotTrusted Zerocoded { AgentData Single - { ID LLUUID } + { AgentID LLUUID } + { SessionID LLUUID } { BodyRotation LLQuaternion } { HeadRotation LLQuaternion } { State U8 } @@ -2275,13 +2176,14 @@ { AgentThrottle Low NotTrusted Zerocoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } { CircuitCode U32 } - { GenCounter U32 } } { Throttle Single + { GenCounter U32 } { Throttles Variable 1 } } } @@ -2291,13 +2193,14 @@ { AgentFOV Low NotTrusted Unencoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } { CircuitCode U32 } - { GenCounter U32 } } { FOVBlock Single + { GenCounter U32 } { VerticalAngle F32 } } } @@ -2308,13 +2211,14 @@ { AgentHeightWidth Low NotTrusted Unencoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } { CircuitCode U32 } - { GenCounter U32 } } { HeightWidthBlock Single + { GenCounter U32 } { Height U16 } { Width U16 } } @@ -2325,8 +2229,9 @@ { AgentSetAppearance Low NotTrusted Zerocoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } { SerialNum U32 } // U32, Increases every time the appearance changes. A value of 0 resets. { Size LLVector3 } } @@ -2350,8 +2255,9 @@ { AgentAnimation High NotTrusted Unencoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } { AnimationList Variable @@ -2364,8 +2270,9 @@ { AgentRequestSit High NotTrusted Zerocoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } { TargetObject Single @@ -2378,22 +2285,12 @@ { AgentSit High NotTrusted Unencoded { - Sender Single - { ID LLUUID } - } -} - -// RefreshViewer - sent by viewer when it has missing geometry, etc., due to dropped packets. - -{ - RefreshViewer Low NotTrusted Unencoded - { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } } - // AgentQuit - Sent by viewer when viewer exits normally // Fuse is used to allow Reset to be passed to neighbors // *NOTE: obsolete @@ -2426,6 +2323,11 @@ { RequestImage High NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { RequestImage Variable { Image LLUUID } { DiscardLevel S32 } @@ -2460,8 +2362,9 @@ { SetAlwaysRun Low NotTrusted Unencoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } { AlwaysRun BOOL } } } @@ -2521,38 +2424,8 @@ { Rotation LLQuaternion } { TextureEntry Variable 2 } - - { NameValue Variable 2 } { State U8 } } - { - InventoryData Variable - { ItemID LLUUID } - { FolderID LLUUID } - { CreatorID LLUUID } // permissions - { OwnerID LLUUID } // permissions - { GroupID LLUUID } // permissions - { BaseMask U32 } // permissions - { OwnerMask U32 } // permissions - { GroupMask U32 } // permissions - { EveryoneMask U32 } // permissions - { NextOwnerMask U32 } // permissions - { GroupOwned BOOL } // permissions - { AssetID LLUUID } - { Type S8 } - { InvType S8 } - { Flags U32 } - { SaleType U8 } - { SalePrice S32 } - { Name Variable 1 } - { Description Variable 1 } - { CreationDate S32 } - { CRC U32 } - } - { - InventoryFile Single - { Filename Variable 1 } - } } @@ -2632,6 +2505,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -2656,6 +2530,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -2740,6 +2615,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3014,6 +2890,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3029,6 +2906,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3043,6 +2921,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { AttachmentPoint U8 } } { @@ -3058,6 +2937,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3072,6 +2952,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3086,6 +2967,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3099,6 +2981,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3112,6 +2995,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { JointType Single @@ -3130,6 +3014,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Variable @@ -3143,8 +3028,9 @@ { ObjectGrab Low NotTrusted Zerocoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3162,7 +3048,8 @@ ObjectGrabUpdate Low NotTrusted Zerocoded { AgentData Single - { AgentID LLUUID } + { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3178,8 +3065,9 @@ { ObjectDeGrab Low NotTrusted Unencoded { - Sender Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3194,6 +3082,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3208,6 +3097,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3223,6 +3113,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { ObjectData Single @@ -3231,6 +3122,7 @@ } // Export selected objects +// viewer->sim { ObjectExportSelected Low NotTrusted Zerocoded { @@ -3246,6 +3138,7 @@ } // Import an object +// viewer->sim { ObjectImport Low NotTrusted Zerocoded { @@ -3266,8 +3159,12 @@ { ModifyLand Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { ModifyBlock Single - { AgentID LLUUID } { Action U8 } { BrushSize U8 } { Seconds F32 } @@ -3285,17 +3182,33 @@ // VelocityInterpolateOn +// viewer->sim +// requires administrative access { VelocityInterpolateOn Low NotTrusted Unencoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } } // VelocityInterpolateOff +// viewer->sim +// requires administrative access { VelocityInterpolateOff Low NotTrusted Unencoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } } // Save State +// viewer->sim +// requires administrative access { StateSave Low NotTrusted Unencoded { @@ -3309,8 +3222,8 @@ } } - // ReportAutosaveCrash +// sim->launcher { ReportAutosaveCrash Low NotTrusted Unencoded { @@ -3320,8 +3233,6 @@ } } - - // SimWideDeletes { SimWideDeletes Low NotTrusted Unencoded @@ -3337,21 +3248,6 @@ } } -// Load State -// Not in use \P/hoenix - 2004.07.14 -{ - StateLoad Low NotTrusted Unencoded - { - AgentData Single - { AgentID LLUUID } - { SessionID LLUUID } - } - { - DataBlock Single - { Filename Variable 1 } - } -} - // RequestObjectPropertiesFamily // Ask for extended information, such as creator, permissions, resources, etc. // Medium frequency because it is driven by mouse hovering over objects, which @@ -3359,9 +3255,13 @@ { RequestObjectPropertiesFamily Medium NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { ObjectData Single { RequestFlags U32 } - { AgentID LLUUID } { ObjectID LLUUID } } } @@ -3373,8 +3273,12 @@ { TrackAgent Low NotTrusted Unencoded { - AgentBlock Single + AgentData Single { AgentID LLUUID } + { SessionID LLUUID } + } + { + TargetData Single { PreyID LLUUID } } } @@ -3547,8 +3451,12 @@ { ScriptAnswerYes Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { Data Single - { AgentID LLUUID } { TaskID LLUUID } { ItemID LLUUID } { Questions S32 } @@ -3561,10 +3469,14 @@ { UserReport Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { ReportData Single { ReportType U8 } // BUG=1, COMPLAINT=2 { Category U8 } // see sequence.user_report_category - { ReporterID LLUUID } { Position LLVector3 } // screenshot position, region-local { CheckFlags U8 } // checkboxflags { ScreenshotID LLUUID } @@ -3853,6 +3765,11 @@ { RegionHandshakeReply Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { RegionInfo Single { Flags U32 } } @@ -4553,6 +4470,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { AvatarID LLUUID } } } @@ -4625,17 +4543,16 @@ // AvatarPropertiesUpdate // viewer -> simulator -// simulator -> dataserver // reliable { AvatarPropertiesUpdate Low NotTrusted Zerocoded { AgentData Single - { AgentID LLUUID } + { AgentID LLUUID } + { SessionID LLUUID } } { PropertiesData Single - { AvatarID LLUUID } { ImageID LLUUID } { FLImageID LLUUID } { AboutText Variable 2 } // string, up to 512 @@ -4698,6 +4615,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { Data Single @@ -5005,8 +4923,12 @@ { ScriptDialogReply Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { Data Single - { AgentID LLUUID } { ObjectID LLUUID } { ChatChannel S32 } { ButtonIndex S32 } @@ -5020,8 +4942,9 @@ { ForceScriptControlRelease Low NotTrusted Unencoded { - Data Single - { ID LLUUID } + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } } } @@ -5030,8 +4953,12 @@ { RevokePermissions Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { Data Single - { AgentID LLUUID } { ObjectID LLUUID } { ObjectPermissions U32 } } @@ -5736,26 +5663,6 @@ } } -// userserver -> dataserver -// Used to request all parcel sales in the database -//{ -// RequestParcelSales Low Trusted Unencoded -//} - -// dataserver -> userserver -> spaceserver -// response of all (up to max packet size) parcel sales in the database. -// each block in the meassage represents a parcel that a human agreed -// to pay US$. -//{ -// BulkParcelSales Low Trusted Unencoded -// { -// ParcelData Variable -// { RegionHandle U64 } -// { ParcelID LLUUID } -// { BuyerID LLUUID } -// } -//} - // sim -> dataserver { CheckParcelSales Low Trusted Unencoded @@ -6375,133 +6282,6 @@ } } -// LoginRequestSafe -// Attempt to log into the system with an auth token obtained via a -// secure out of band mechanism (such as a TLS tunnel) -// viewer -> userserver -// unreliable -//{ -// LoginRequestSafe Low NotTrusted Unencoded -// { -// LoginBlock Single -// { AuthToken LLUUID } // session id really -// { ViewerDigest LLUUID } // MD5 of viewer exe -// { LastExecFroze BOOL } -// } -//} - -// LoginReply -// Identifies the session, or sends LLUUID::null if invalid -// userserver -> viewer -//{ -// LoginReply Low Trusted Zerocoded -// { -// UserData Single -// { Firstname Variable 1 } // string, canonical caps -// { Lastname Variable 1 } // string, canonical caps -// { SessionID LLUUID } -// { AgentID LLUUID } -// { ErrorMessage Variable 1 } -// { AgentAccess U8 } -// { GroupOfficer BOOL } -// { GroupTitle Variable 1 } -// { GroupID LLUUID } -// { GroupName Variable 1 } -// { GroupInsigniaID LLUUID } -// { LoginFlags U32 } // bitfield -// { SunTextureID LLUUID } -// { MoonTextureID LLUUID } -// { CloudTextureID LLUUID } -// { TOSAssetID LLUUID } // Null if TOS agreement is current -// { CriticalMessageAssetID LLUUID } // Null if message is current -// { TrialDaysLeft S32 } // Zero if not trial -// { ServerUTCTime U32 } // time_t, unix time format -// } -// { -// StartLocationData Variable -// { LocationID U32 } -// { LocationRegionX U32 } // U32, meters to southwest -// { LocationRegionY U32 } -// { LocationPos LLVector3 } // Vector3, region coords -// { LocationLookAt LLVector3 } // Vector3 -// } -//} - -// DataserverLoginRequestSafe -// userserver -> dataserver -//{ -// DataserverLoginRequestSafe Low Trusted Unencoded -// { -// UserData Single -// { AuthToken LLUUID } // session id really -// { IP IPADDR } -// { Port IPPORT } -// { SpaceIP IPADDR } -// { ViewerDigest LLUUID } -// { LastExecFroze BOOL } -// } -//} - -// DataServerLoginReply -// TimeValid is true if user is allowed to log in at this time -// dataserver -> userserver -// reliable -//{ -// DataServerLoginReply Low Trusted Zerocoded -// { -// UserData Single -// { Firstname Variable 1 } // string -// { Lastname Variable 1 } // string -// { IP IPADDR } // don't think this is valid JC 6/02 -// { Port IPPORT } // don't think this is valid JC 6/02 -// { LoginValid BOOL } -// { TimeValid BOOL } -// { ErrorMessage Variable 1 } // string -// { AgentID LLUUID } -// { SessionID LLUUID } -// { LimitedToEstate U32 } -// { AgentAccess U8 } -// { GroupOfficer BOOL } -// { GroupTitle Variable 1 } -// { GroupID LLUUID } -// { GroupName Variable 1 } -// { GroupInsigniaID LLUUID } -// { LoginFlags U32 } // bitfield -// { SunTextureID LLUUID } -// { MoonTextureID LLUUID } -// { CloudTextureID LLUUID } -// { TOSAssetID LLUUID } // Null if TOS agreement is current -// { CriticalMessageAssetID LLUUID } // Null if message is current -// { TrialDaysLeft S32 } // Zero if not trial -// { ServerUTCTime U32 } // time_t, unix time format -// { SpaceIP IPADDR } -// { ViewerDigest LLUUID } -// { LastExecFroze BOOL } -// } -// { -// StartLocationData Variable -// { LocationID U32 } -// { LocationRegionX U32 } -// { LocationRegionY U32 } -// { LocationPos LLVector3 } // Vector3 -// { LocationLookAt LLVector3 } // Vector3 -// } -//} - -// The user agrees to the current Terms of Service -// or clicks OK on the current critical message -// type 0 = TOS -// type 1 = critical message -// viewer -> userserver -> dataserver -//{ -// TOSAgreement Low NotTrusted Unencoded -// { -// AgentBlock Single -// { AgentID LLUUID } -// { Type S32 } -// } -//} - // This message is sent from the viewer on login or on demand from the // userserver. // viewer -> userserver @@ -6591,86 +6371,6 @@ } } - -//----------------------------------------------------------------------------- -// Viewer to UserServer Messages -//----------------------------------------------------------------------------- - -// ViewerLoginLocationRequest -// viewer -> userserver -// *NOTE: obsolete -{ - ViewerLoginLocationRequest Low NotTrusted Unencoded - { - AgentData Single - { AgentID LLUUID } - { SessionID LLUUID } - } - { - PositionBlock Single - { ViewerRegion U64 } - { ViewerPosition LLVector3 } - } - { - URLBlock Single - { SimName Variable 1 } - { Pos LLVector3 } - } -} - -// ViewerSimLocationRequest -// viewer -> userserver -// *NOTE: obsolete -{ - ViewerSimLocationRequest Low NotTrusted Unencoded - { - PositionBlock Single - { AgentID LLUUID } - { SimName Variable 1 } - } -} - -// RequestLocationGetAccess -// userserver -> dataserver -// *NOTE: obsolete. -{ - RequestLocationGetAccess Low Trusted Unencoded - { - PositionBlock Single - { AgentID LLUUID } - { SessionID LLUUID } - { ViewerIP IPADDR } - { ViewerPort IPPORT } - { ViewerRegion U64 } - { ViewerPosition LLVector3 } - } -} - -// RequestLocationGetAccessReply -// dataserver -> userserver -// *NOTE: obsolete. -{ - RequestLocationGetAccessReply Low Trusted Unencoded - { - PositionBlock Single - { ViewerIP IPADDR } - { ViewerPort IPPORT } - { ViewerRegion U64 } - { ViewerPosition LLVector3 } - { TravelAccess U8 } - } -} - - -// UserListRequest -// Get a list of the current system users -// viewer -> userserver -//*NOTE: obsolete -{ - UserListRequest Low NotTrusted Unencoded -} - - //----------------------------------------------------------------------------- // Instant Message //----------------------------------------------------------------------------- @@ -6708,43 +6408,6 @@ } } -// Start group IM session. If everyone is 1, then offline users also -// get the messages. -{ - StartGroupIM Low NotTrusted Unencoded - { - SessionBlock Single - { SessionID LLUUID } - { Everyone U8 } - } - { - Participants Variable - { AgentID LLUUID } - } -} - -// drop out from a group instant message -{ - DropGroupIM Low NotTrusted Unencoded - { - SessionBlock Single - { SessionID LLUUID } - { AgentID LLUUID } - } -} - -// Group instant messaging -{ - GroupIM Low NotTrusted Unencoded - { - MessageBlock Single - { SessionID LLUUID } - { FromID LLUUID } - { FromAgentName Variable 1 } - { Message Variable 2 } - } -} - // RetrieveInstantMessages - used to get instant messages that // were persisted out to the database while the user was offline { @@ -6780,27 +6443,6 @@ } } -// This message is sent viewer->userserver to track if other agents -// come on or off line. -{ - TrackOnlineStatus Low NotTrusted Zerocoded - { - AgentBlock Variable - { AgentID LLUUID } - } -} - -// This message is sent viewer->userserver to ignore logon and logoff -// events for the specified agents. This is typically sent when a -// calling card is deleted or cancelled. -{ - IgnoreOnlineStatus Low NotTrusted Zerocoded - { - AgentBlock Variable - { AgentID LLUUID } - } -} - // Set godlike to 1 if you want to become godlike. // Set godlike to 0 if you want to relinquish god powers. // viewer -> simulator -> dataserver @@ -6949,31 +6591,46 @@ } -// viewer -> userserver, gimme inventory -//{ -// InventoryRequest Low NotTrusted Unencoded -// { -// InventoryData Single -// { AgentID LLUUID } -// { CacheCRC U32 } -// } -//} - // // Inventory update messages // + { - UpdateInventoryItem Low NotTrusted Zerocoded + CopyInventoryFromNotecard Low NotTrusted Zerocoded { AgentData Single { AgentID LLUUID } { SessionID LLUUID } } { + NotecardData Single + { NotecardItemID LLUUID } + { ObjectID LLUUID } + } + { InventoryData Variable { ItemID LLUUID } { FolderID LLUUID } + } +} +// +// This is used bi-directionally between sim, dataserver, and viewer. +// THIS MESSAGE CAN NOT CREATE NEW INVENTORY ITEMS. +// +{ + UpdateInventoryItem Low NotTrusted Zerocoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { + InventoryData Variable + { ItemID LLUUID } + { FolderID LLUUID } + { CallbackID U32 } // Async Response + { CreatorID LLUUID } // permissions { OwnerID LLUUID } // permissions { GroupID LLUUID } // permissions @@ -6984,7 +6641,7 @@ { NextOwnerMask U32 } // permissions { GroupOwned BOOL } // permissions - { AssetID LLUUID } + { TransactionID LLUUID } // TransactionID: new assets only { Type S8 } { InvType S8 } { Flags U32 } @@ -6997,17 +6654,43 @@ } } -// When all that has updated is the asset, we can crunch this down. +// +// For sim to request update/create. +// DO NOT ALLOW THIS FROM THE VIEWER. +// { - UpdateInventoryItemAsset Low NotTrusted Zerocoded + UpdateCreateInventoryItem Low Trusted Zerocoded { AgentData Single { AgentID LLUUID } + { SimApproved BOOL } } { InventoryData Variable { ItemID LLUUID } + { FolderID LLUUID } + { CallbackID U32 } // Async Response + + { CreatorID LLUUID } // permissions + { OwnerID LLUUID } // permissions + { GroupID LLUUID } // permissions + { BaseMask U32 } // permissions + { OwnerMask U32 } // permissions + { GroupMask U32 } // permissions + { EveryoneMask U32 } // permissions + { NextOwnerMask U32 } // permissions + { GroupOwned BOOL } // permissions + { AssetID LLUUID } + { Type S8 } + { InvType S8 } + { Flags U32 } + { SaleType U8 } + { SalePrice S32 } + { Name Variable 1 } + { Description Variable 1 } + { CreationDate S32 } + { CRC U32 } } } @@ -7016,6 +6699,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Stamp BOOL } // should the server re-timestamp? } { @@ -7027,16 +6711,21 @@ // copy inventory item by item id to specified destination folder, // send out bulk inventory update when done. -// currently only sim->data, but it is general enough to be -// a viewer request. +// +// Inventory items are only unique for {agent, inv_id} pairs; +// the OldItemID needs to be paired with the OldAgentID to +// produce a unique inventory item. { CopyInventoryItem Low NotTrusted Zerocoded { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { InventoryData Variable + { CallbackID U32 } // Async response + { OldAgentID LLUUID } { OldItemID LLUUID } { NewFolderID LLUUID } } @@ -7047,6 +6736,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { InventoryData Variable @@ -7059,6 +6749,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { InventoryData Variable @@ -7067,7 +6758,9 @@ } } - +// +// Sim outgoing only (to dataserver, to viewer) +// NOT viewer to sim, sim should not have handler, ever { SaveAssetIntoInventory Low NotTrusted Unencoded { @@ -7086,6 +6779,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { FolderData Single @@ -7101,6 +6795,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { FolderData Variable @@ -7116,6 +6811,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Stamp BOOL } // should the server re-timestamp children } { @@ -7130,6 +6826,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { FolderData Variable @@ -7143,6 +6840,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { InventoryData Single @@ -7207,6 +6905,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { InventoryData Variable @@ -7252,6 +6951,7 @@ // Can only fit around 7 items per packet - that's the way it goes. At // least many bulk updates can be packed. +// Only from dataserver->sim->viewer { BulkUpdateInventory Low Trusted Zerocoded { @@ -7269,6 +6969,7 @@ { ItemData Variable { ItemID LLUUID } + { CallbackID U32 } // Async Response { FolderID LLUUID } { CreatorID LLUUID } // permissions { OwnerID LLUUID } // permissions @@ -7327,6 +7028,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { FolderData Variable @@ -7381,7 +7083,7 @@ { EveryoneMask U32 } // permissions { NextOwnerMask U32 } // permissions { GroupOwned BOOL } // permissions - { AssetID LLUUID } + { TransactionID LLUUID } { Type S8 } { InvType S8 } { Flags U32 } @@ -7526,7 +7228,7 @@ { EveryoneMask U32 } // permissions { NextOwnerMask U32 } // permissions { GroupOwned BOOL } // permissions - { AssetID LLUUID } + { TransactionID LLUUID } { Type S8 } { InvType S8 } { Flags U32 } @@ -7539,6 +7241,42 @@ } } +// This message is sent from viewer -> simulator when the viewer wants +// to rez an object from a notecard. +{ + RezObjectFromNotecard Low NotTrusted Zerocoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + { GroupID LLUUID } + } + { + RezData Single + { FromTaskID LLUUID } + { BypassRaycast U8 } + { RayStart LLVector3 } + { RayEnd LLVector3 } + { RayTargetID LLUUID } + { RayEndIsIntersection BOOL } + { RezSelected BOOL } + { RemoveItem BOOL } + { ItemFlags U32 } + { GroupMask U32 } + { EveryoneMask U32 } + { NextOwnerMask U32 } + } + { + NotecardData Single + { NotecardItemID LLUUID } + { ObjectID LLUUID } + } + { + InventoryData Variable + { ItemID LLUUID } + } +} + // if declined, the destid agent from the GiveInventory message // responds with this message to the userserver { @@ -7549,7 +7287,7 @@ } } -// userserver -> dataserver +// sim -> dataserver // sent during agent to agent inventory transfers { TransferInventory Low Trusted Zerocoded @@ -7566,7 +7304,7 @@ } } -// dataserver -> userserver +// dataserver -> sim // InventoryID is the id of the inventory object that the end user // should discard if they deny the transfer. { @@ -7583,8 +7321,12 @@ { RequestFriendship Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { AgentBlock Single - { SourceID LLUUID } { FolderID LLUUID } // source ID's calling card folder { DestID LLUUID } { TransactionID LLUUID } @@ -7594,6 +7336,11 @@ { AcceptFriendship Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { TransactionBlock Single { TransactionID LLUUID } } @@ -7606,22 +7353,16 @@ { DeclineFriendship Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { TransactionBlock Single { TransactionID LLUUID } } } - -//{ -// AddCallingCard Low NotTrusted Unencoded -// { -// CardBlock Variable -// { SourceUUID LLUUID } -// { DestUUID LLUUID } -// { Name Variable 1 } -// } -//} - { FormFriendship Low Trusted Unencoded { @@ -7653,8 +7394,12 @@ { OfferCallingCard Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { AgentBlock Single - { SourceID LLUUID } { DestID LLUUID } { TransactionID LLUUID } } @@ -7663,6 +7408,11 @@ { AcceptCallingCard Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { TransactionBlock Single { TransactionID LLUUID } } @@ -7675,6 +7425,11 @@ { DeclineCallingCard Low NotTrusted Unencoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { TransactionBlock Single { TransactionID LLUUID } } @@ -7708,7 +7463,7 @@ { EveryoneMask U32 } // permissions { NextOwnerMask U32 } // permissions { GroupOwned BOOL } // permissions - { AssetID LLUUID } + { TransactionID LLUUID } { Type S8 } { InvType S8 } { Flags U32 } @@ -7731,10 +7486,13 @@ } { InventoryBlock Single + { CallbackID U32 } // Async Response { FolderID LLUUID } + { TransactionID LLUUID } // Going to become TransactionID { NextOwnerMask U32 } { Type S8 } { InvType S8 } + { WearableType U8 } { Name Variable 1 } { Description Variable 1 } } @@ -7795,14 +7553,6 @@ } } -//{ -// RegionIDRequest Low NotTrusted Unencoded -// { -// RequestBlock Single -// { RegionHandle U64 } -// } -//} - { RegionIDAndHandleReply Low Trusted Unencoded { @@ -8151,6 +7901,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } } { @@ -8168,6 +7919,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } } { @@ -8197,15 +7949,6 @@ } } -// possible alternate to InventoryUpdate - tells viewer to load cached inventory -//{ -// UseCachedInventory Low Trusted Unencoded -// { -// InventoryData Single -// { AgentID LLUUID } -// } -//} - // dataserver-> userserver -> viewer to move around the mute list { MuteListUpdate Low Trusted Unencoded @@ -8308,8 +8051,12 @@ { SetStartLocationRequest Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { StartLocationData Single - { AgentID LLUUID } { SimName Variable 1 } // string { LocationID U32 } { LocationPos LLVector3 } // region coords @@ -8512,8 +8259,10 @@ // Add/Remove Attachment messages // *************************************************************************** - +// // Simulator informs Dataserver of new attachment or attachment asset update +// DO NOT ALLOW THIS FROM THE VIEWER +// { UpdateAttachment Low Trusted Zerocoded { @@ -8650,7 +8399,7 @@ AssetUploadRequest Low NotTrusted Unencoded { AssetBlock Single - { UUID LLUUID } + { TransactionID LLUUID } { Type S8 } { Tempfile BOOL } { StoreLocal BOOL } @@ -9597,26 +9346,28 @@ // AgentWearablesRequest // (a.k.a. "Tell me what the avatar is wearing.") -// viewer -> userserver -> dataserver +// viewer -> simulator -> dataserver // reliable { AgentWearablesRequest Low NotTrusted Unencoded { AgentData Single - { AgentID LLUUID } // UUID + { AgentID LLUUID } + { SessionID LLUUID } } } // AgentWearablesUpdate -// (a.k.a. "Here's what the avatar is wearing now.") -// viewer -> userserver -> dataserver +// (a.k.a. "Here's what your avatar should be wearing now.") // dataserver -> userserver -> viewer // reliable +// NEVER from viewer to sim { - AgentWearablesUpdate Low NotTrusted Zerocoded + AgentWearablesUpdate Low Trusted Zerocoded { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { SerialNum U32 } // U32, Increases every time the wearables change for a given agent. Used to avoid processing out of order packets. } { @@ -9627,6 +9378,26 @@ } } +// +// AgentIsNowWearing +// (a.k.a. "Here's what I'm wearing now.") +// viewer->sim->dataserver +// reliable +{ + AgentIsNowWearing Low NotTrusted Zerocoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { + WearableData Variable + { ItemID LLUUID } + { WearableType U8 } + } +} + + // AgentCachedTexture // viewer queries for cached textures on dataserver (via simulator) // viewer -> simulator -> dataserver @@ -9821,33 +9592,41 @@ { RezSingleAttachmentFromInv Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { ObjectData Single - { AgentID LLUUID } - { AssetID LLUUID } // asset id in inventory - { ItemID LLUUID } // inventory item id - { AttachmentPt U8 } // 0 for default - { ItemFlags U32 } - { GroupMask U32 } - { EveryoneMask U32 } - { NextOwnerMask U32 } - { Name Variable 1 } - { Description Variable 1 } + { ItemID LLUUID } + { OwnerID LLUUID } + { AttachmentPt U8 } // 0 for default + { ItemFlags U32 } + { GroupMask U32 } + { EveryoneMask U32 } + { NextOwnerMask U32 } + { Name Variable 1 } + { Description Variable 1 } } } { RezMultipleAttachmentsFromInv Low NotTrusted Zerocoded { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { HeaderData Single { CompoundMsgID LLUUID } // All messages a single "compound msg" must have the same id { TotalObjects U8 } - { AgentID LLUUID } - { FirstDetachAll U8 } + { FirstDetachAll BOOL } } { - ObjectData Variable // 1 to 4 of these per packet - { AssetID LLUUID } // asset id in inventory - { ItemID LLUUID } // inventory item id + ObjectData Variable // 1 to 4 of these per packet + { ItemID LLUUID } + { OwnerID LLUUID } { AttachmentPt U8 } // 0 for default { ItemFlags U32 } { GroupMask U32 } @@ -9898,6 +9677,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } } @@ -9919,6 +9699,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } } { UserData Single @@ -10094,6 +9875,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } { EstateID U32 } // filled in on sim { Godlike BOOL } // filled in on sim @@ -10102,7 +9884,7 @@ // sim -> viewer { - MapLayerReply Low NotTrusted Unencoded + MapLayerReply Low Trusted Unencoded { AgentData Single { AgentID LLUUID } @@ -10127,6 +9909,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } { EstateID U32 } // filled in on sim { Godlike BOOL } // filled in on sim @@ -10149,6 +9932,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } { EstateID U32 } // filled in on sim { Godlike BOOL } // filled in on sim @@ -10161,7 +9945,7 @@ // sim -> viewer { - MapBlockReply Low NotTrusted Unencoded + MapBlockReply Low Trusted Unencoded { AgentData Single { AgentID LLUUID } @@ -10190,6 +9974,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { Flags U32 } { EstateID U32 } // filled in on sim { Godlike BOOL } // filled in on sim @@ -10203,7 +9988,7 @@ // sim -> viewer { - MapItemReply Low NotTrusted Unencoded + MapItemReply Low Trusted Unencoded { AgentData Single { AgentID LLUUID } @@ -10233,6 +10018,7 @@ { AgentData Single { AgentID LLUUID } + { SessionID LLUUID } { AssetID LLUUID } { PosGlobal LLVector3d } // Where snapshot was taken { To Variable 1 } // dest email address(es) @@ -10324,8 +10110,9 @@ // Simulator asks for what sim a script lives on (intersim object->object email delivery) // simulator -> dataserver +// *NOTE: Not in use. Phoenix 2006-08-16 { - MailTaskSimRequest Low NotTrusted Unencoded + MailTaskSimRequest Low Trusted Unencoded { DataBlock Single { TaskID LLUUID } @@ -10334,8 +10121,9 @@ // Reply from dataserver to simulator about where a mailping needs to go. // Same as below, but needs to be different as it has different routing. +// *NOTE: Not in use. Phoenix 2006-08-16 { - MailTaskSimReply Low NotTrusted Unencoded + MailTaskSimReply Low Trusted Unencoded { TargetBlock Single { TargetIP Variable 1 } // String IP @@ -10350,7 +10138,7 @@ // ScriptMailRegistration // Simulator -> dataserver { - ScriptMailRegistration Low NotTrusted Unencoded + ScriptMailRegistration Low Trusted Unencoded { DataBlock Single { TargetIP Variable 1 } // String IP @@ -10360,27 +10148,10 @@ } } - -// MailPingBounce -// This is sent to the RPC server when the sim can not be found. -// Not currently used. -// Spaceserver -> RPC server -{ - MailPingBounce Low NotTrusted Unencoded - { - DataBlock Single - { TargetIP IPADDR } - { TargetPort IPPORT } - { TaskID LLUUID } - { Flags U32 } - } -} - - // ParcelMediaCommandMessage // Sends a parcel media command { - ParcelMediaCommandMessage Low NotTrusted Unencoded + ParcelMediaCommandMessage Low Trusted Unencoded { CommandBlock Single { Flags U32 } @@ -10393,7 +10164,7 @@ // Sends a parcel media update to a single user // For global updates use the parcel manager. { - ParcelMediaUpdate Low NotTrusted Unencoded + ParcelMediaUpdate Low Trusted Unencoded { DataBlock Single { MediaURL Variable 1 } // string @@ -10421,9 +10192,9 @@ } // LandStatReply -// Sent by the simulator in response to LandCollidersRequest +// Sent by the simulator in response to LandStatRequest { - LandStatReply Low NotTrusted Unencoded + LandStatReply Low Trusted Unencoded { RequestData Single { ReportType U32 } @@ -10442,7 +10213,3 @@ { OwnerName Variable 1 } } } - - - -
_______________________________________________ libsecondlife-dev mailing list libsecondlife-dev@gna.org https://mail.gna.org/listinfo/libsecondlife-dev http://www.libsecondlife.org/