From dd0db18bd98d83a22a8f32ee3472e4c92c26036d Mon Sep 17 00:00:00 2001 From: "enus.linden" Date: Thu, 29 Jan 2009 22:46:34 +0000 Subject: [PATCH] updating message* files --- pyogp/lib/base/message/data/message.xml | 64 +++- .../base/message/data/message_template.msg | 310 +++++++++++------- 2 files changed, 258 insertions(+), 116 deletions(-) diff --git a/pyogp/lib/base/message/data/message.xml b/pyogp/lib/base/message/data/message.xml index 701d049..d833074 100644 --- a/pyogp/lib/base/message/data/message.xml +++ b/pyogp/lib/base/message/data/message.xml @@ -360,6 +360,14 @@ true + ParcelObjectOwnersReply + + flavor + llsd + trusted-sender + true + + ParcelProperties flavor @@ -368,6 +376,14 @@ true + LandStatReply + + flavor + llsd + trusted-sender + true + + avatarnotesrequest service_name @@ -425,6 +441,30 @@ true + EnableSimulator + + flavor + llsd + trusted-sender + true + + + TeleportFinish + + flavor + llsd + trusted-sender + true + + + CrossedRegion + + flavor + llsd + trusted-sender + true + + ScriptRunningReply @@ -433,6 +473,14 @@ trusted-sender false + + LandStatReply + + flavor + llsd + trusted-sender + false + StartGroupProposal @@ -477,7 +525,7 @@ false UpdateScriptAgentInventory - true + false UpdateGestureTaskInventory false @@ -486,7 +534,7 @@ true UpdateScriptTaskInventory - true + false ViewerStartAuction true @@ -540,6 +588,18 @@ true FetchInventoryDescendents + false + + WebFetchInventoryDescendents + true + + FetchInventory + true + + FetchLibDescendents + true + + FetchLib true diff --git a/pyogp/lib/base/message/data/message_template.msg b/pyogp/lib/base/message/data/message_template.msg index 61df959..6d90622 100644 --- a/pyogp/lib/base/message/data/message_template.msg +++ b/pyogp/lib/base/message/data/message_template.msg @@ -738,7 +738,7 @@ version 2.0 } { QueryReplies Variable - { AgentID LLUUID } + { AgentID LLUUID } { FirstName Variable 1 } { LastName Variable 1 } { Group Variable 1 } @@ -899,11 +899,11 @@ version 2.0 // reliable { ClassifiedInfoReply Low 44 Trusted Unencoded - { - AgentData Single - { AgentID LLUUID } - } - { + { + AgentData Single + { AgentID LLUUID } + } + { Data Single { ClassifiedID LLUUID } { CreatorID LLUUID } @@ -911,16 +911,16 @@ version 2.0 { ExpirationDate U32 } { Category U32 } { Name Variable 1 } - { Desc Variable 2 } + { Desc Variable 2 } { ParcelID LLUUID } { ParentEstate U32 } - { SnapshotID LLUUID } - { SimName Variable 1 } - { PosGlobal LLVector3d } - { ParcelName Variable 1 } + { SnapshotID LLUUID } + { SimName Variable 1 } + { PosGlobal LLVector3d } + { ParcelName Variable 1 } { ClassifiedFlags U8 } { PriceForListing S32 } - } + } } @@ -1179,7 +1179,7 @@ version 2.0 // simulator -> viewer // reliable { - ParcelObjectOwnersReply Low 57 Trusted Zerocoded + ParcelObjectOwnersReply Low 57 Trusted Zerocoded UDPDeprecated { Data Variable { OwnerID LLUUID } @@ -1389,7 +1389,7 @@ version 2.0 // called when all of the information has been collected and readied for // the agent. { - TeleportFinish Low 69 Trusted Unencoded + TeleportFinish Low 69 Trusted Unencoded UDPBlackListed { Info Single { AgentID LLUUID } @@ -2436,6 +2436,15 @@ version 2.0 { LocalID U32 } { GrabOffset LLVector3 } } + { + SurfaceInfo Variable + { UVCoord LLVector3 } + { STCoord LLVector3 } + { FaceIndex S32 } + { Position LLVector3 } + { Normal LLVector3 } + { Binormal LLVector3 } + } } @@ -2457,6 +2466,16 @@ version 2.0 { GrabPosition LLVector3 } // LLVector3, region local { TimeSinceLast U32 } } + { + SurfaceInfo Variable + { UVCoord LLVector3 } + { STCoord LLVector3 } + { FaceIndex S32 } + { Position LLVector3 } + { Normal LLVector3 } + { Binormal LLVector3 } + } + } @@ -2472,6 +2491,15 @@ version 2.0 ObjectData Single { LocalID U32 } } + { + SurfaceInfo Variable + { UVCoord LLVector3 } + { STCoord LLVector3 } + { FaceIndex S32 } + { Position LLVector3 } + { Normal LLVector3 } + { Binormal LLVector3 } + } } @@ -2669,56 +2697,56 @@ version 2.0 // end viewer to simulator section { - ViewerStats Low 131 NotTrusted Zerocoded - { - AgentData Single - { AgentID LLUUID } - { SessionID LLUUID } - { IP IPADDR } - { StartTime U32 } - { RunTime F32 } // F32 - { SimFPS F32 } // F32 - { FPS F32 } // F32 - { AgentsInView U8 } // - { Ping F32 } // F32 - { MetersTraveled F64 } - { RegionsVisited S32 } - { SysRAM U32 } - { SysOS Variable 1 } // String - { SysCPU Variable 1 } // String - { SysGPU Variable 1 } // String - } + ViewerStats Low 131 NotTrusted Zerocoded + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + { IP IPADDR } + { StartTime U32 } + { RunTime F32 } // F32 + { SimFPS F32 } // F32 + { FPS F32 } // F32 + { AgentsInView U8 } // + { Ping F32 } // F32 + { MetersTraveled F64 } + { RegionsVisited S32 } + { SysRAM U32 } + { SysOS Variable 1 } // String + { SysCPU Variable 1 } // String + { SysGPU Variable 1 } // String + } - { - DownloadTotals Single - { World U32 } - { Objects U32 } - { Textures U32 } - } + { + DownloadTotals Single + { World U32 } + { Objects U32 } + { Textures U32 } + } - { - NetStats Multiple 2 - { Bytes U32 } - { Packets U32 } - { Compressed U32 } - { Savings U32 } - } + { + NetStats Multiple 2 + { Bytes U32 } + { Packets U32 } + { Compressed U32 } + { Savings U32 } + } - { - FailStats Single - { SendPacket U32 } - { Dropped U32 } - { Resent U32 } - { FailedResends U32 } - { OffCircuit U32 } - { Invalid U32 } - } + { + FailStats Single + { SendPacket U32 } + { Dropped U32 } + { Resent U32 } + { FailedResends U32 } + { OffCircuit U32 } + { Invalid U32 } + } - { - MiscStats Variable - { Type U32 } - { Value F64 } - } + { + MiscStats Variable + { Type U32 } + { Value F64 } + } } // ScriptAnswerYes @@ -2914,6 +2942,14 @@ version 2.0 { UseEstateSun BOOL } { SunHour F32 } // last value set by estate or region controls JC } + { + RegionInfo2 Single + { ProductSKU Variable 1 } // string + { ProductName Variable 1 } // string + { MaxAgents32 U32 } // Identical to RegionInfo.MaxAgents but allows greater range + { HardMaxAgents U32 } + { HardMaxObjects U32 } + } } // GodUpdateRegionInfo @@ -3031,6 +3067,14 @@ version 2.0 RegionInfo2 Single { RegionID LLUUID } } + { + RegionInfo3 Single + { CPUClassID S32 } + { CPURatio S32 } + { ColoName Variable 1 } // string + { ProductSKU Variable 1 } // string + { ProductName Variable 1 } // string + } } // RegionHandshakeReply @@ -3072,10 +3116,10 @@ version 2.0 { You S16 } { Prey S16 } } - { - AgentData Variable - { AgentID LLUUID } - } + { + AgentData Variable + { AgentID LLUUID } + } } // ImageData - sent to viewer to transmit information about an image @@ -3137,7 +3181,7 @@ version 2.0 { RegionData Single { RegionHandle U64 } - { TimeDilation U16 } + { TimeDilation U16 } } { ObjectData Variable @@ -3183,23 +3227,23 @@ version 2.0 { TextColor Fixed 4 } // actually, a LLColor4U { MediaURL Variable 1 } // URL for web page, movie, etc. -// Info for particle systems + // Info for particle systems { PSBlock Variable 1 } -// Extra parameters + // Extra parameters { ExtraParams Variable 1 } -// info for looped attached sounds -// because these are almost always all zero -// the hit after zero-coding is only 2 bytes -// not the 42 you see here + // info for looped attached sounds + // because these are almost always all zero + // the hit after zero-coding is only 2 bytes + // not the 42 you see here { Sound LLUUID } { OwnerID LLUUID } // HACK object's owner id, only set if non-null sound, for muting { Gain F32 } { Flags U8 } { Radius F32 } // cutoff radius -// joint info -- is sent in the update of each joint-child-root + // joint info -- is sent in the update of each joint-child-root { JointType U8 } { JointPivot LLVector3 } { JointAxisOrAnchor LLVector3 } @@ -3268,7 +3312,7 @@ version 2.0 // CrossedRegion - new way to tell a viewer it has gone across a region // boundary { - CrossedRegion Medium 7 Trusted Unencoded + CrossedRegion Medium 7 Trusted Unencoded UDPBlackListed { AgentData Single { AgentID LLUUID } @@ -3306,7 +3350,7 @@ version 2.0 // EnableSimulator - Preps a viewer to receive data from a simulator { - EnableSimulator Low 151 Trusted Unencoded + EnableSimulator Low 151 Trusted Unencoded UDPBlackListed { SimulatorInfo Single { Handle U64 } @@ -4030,26 +4074,26 @@ version 2.0 // reliable { PickInfoReply Low 184 Trusted Unencoded - { - AgentData Single - { AgentID LLUUID } - } - { + { + AgentData Single + { AgentID LLUUID } + } + { Data Single { PickID LLUUID } { CreatorID LLUUID } { TopPick BOOL } { ParcelID LLUUID } { Name Variable 1 } - { Desc Variable 2 } - { SnapshotID LLUUID } - { User Variable 1 } - { OriginalName Variable 1 } - { SimName Variable 1 } - { PosGlobal LLVector3d } - { SortOrder S32 } - { Enabled BOOL } - } + { Desc Variable 2 } + { SnapshotID LLUUID } + { User Variable 1 } + { OriginalName Variable 1 } + { SimName Variable 1 } + { PosGlobal LLVector3d } + { SortOrder S32 } + { Enabled BOOL } + } } @@ -4077,8 +4121,8 @@ version 2.0 { Desc Variable 2 } { SnapshotID LLUUID } { PosGlobal LLVector3d } - { SortOrder S32 } - { Enabled BOOL } + { SortOrder S32 } + { Enabled BOOL } } } @@ -4512,7 +4556,7 @@ version 2.0 // viewer -> sim // reliable { - EstateCovenantRequest Low 203 NotTrusted Unencoded + EstateCovenantRequest Low 203 NotTrusted Unencoded { AgentData Single { AgentID LLUUID } @@ -4524,14 +4568,14 @@ version 2.0 // sim -> viewer // reliable { - EstateCovenantReply Low 204 Trusted Unencoded + EstateCovenantReply Low 204 Trusted Unencoded { Data Single { CovenantID LLUUID } { CovenantTimestamp U32 } { EstateName Variable 1 } // string - { EstateOwnerID LLUUID } - } + { EstateOwnerID LLUUID } + } } @@ -5170,7 +5214,7 @@ version 2.0 { Far F32 } { Aspect F32 } { Throttles Variable 1 } - { LocomotionState U32 } + { LocomotionState U32 } { HeadRotation LLQuaternion } { BodyRotation LLQuaternion } { ControlFlags U32 } @@ -5269,8 +5313,8 @@ version 2.0 // This message is sent how objects get passed between regions. { - AtomicPassObject High 28 Trusted Unencoded - { + AtomicPassObject High 28 Trusted Unencoded + { TaskData Single { TaskID LLUUID } { AttachmentNeedsSave BOOL } // true iff is attachment and needs asset saved @@ -5307,6 +5351,7 @@ version 2.0 { ObjectID LLUUID } { ItemID LLUUID } { Running BOOL } +// { Mono BOOL } Added to LLSD message } } @@ -5575,7 +5620,7 @@ version 2.0 // GodlikeMessage - generalized construct for Gods to send messages // around the system. Each Request has it's own internal protocol. { - GodlikeMessage Low 259 NotTrusted Zerocoded + GodlikeMessage Low 259 NotTrusted Zerocoded { AgentData Single { AgentID LLUUID } @@ -5596,7 +5641,7 @@ version 2.0 // EstateOwnerMessage // format must be identical to above { - EstateOwnerMessage Low 260 NotTrusted Zerocoded + EstateOwnerMessage Low 260 NotTrusted Zerocoded { AgentData Single { AgentID LLUUID } @@ -5618,7 +5663,7 @@ version 2.0 // format must be identical to above // As above, but don't have to be god or estate owner to send. { - GenericMessage Low 261 NotTrusted Zerocoded + GenericMessage Low 261 NotTrusted Zerocoded { AgentData Single { AgentID LLUUID } @@ -8438,7 +8483,7 @@ version 2.0 // Generalized system message. Each Requst has its own protocol for // the StringData block format and contents. { - SystemMessage Low 404 Trusted Zerocoded + SystemMessage Low 404 Trusted Zerocoded { MethodData Single { Method Variable 1 } @@ -8626,27 +8671,27 @@ version 2.0 // Script on simulator requests rpc channel from rpcserver // simulator -> dataserver -> MySQL { - RpcChannelRequest Low 413 Trusted Unencoded - { + RpcChannelRequest Low 413 Trusted Unencoded + { DataBlock Single { GridX U32 } { GridY U32 } - { TaskID LLUUID } - { ItemID LLUUID } - } + { TaskID LLUUID } + { ItemID LLUUID } + } } // RpcServer allocated a session for the script // ChannelID will be the NULL UUID if unable to register // dataserver -> simulator { - RpcChannelReply Low 414 Trusted Unencoded - { - DataBlock Single - { TaskID LLUUID } - { ItemID LLUUID } - { ChannelID LLUUID } - } + RpcChannelReply Low 414 Trusted Unencoded + { + DataBlock Single + { TaskID LLUUID } + { ItemID LLUUID } + { ChannelID LLUUID } + } } // Inbound RPC requests follow this path: @@ -8767,7 +8812,7 @@ version 2.0 // LandStatReply // Sent by the simulator in response to LandStatRequest { - LandStatReply Low 422 Trusted Unencoded + LandStatReply Low 422 Trusted Unencoded UDPDeprecated { RequestData Single { ReportType U32 } @@ -8824,3 +8869,40 @@ version 2.0 { IncludeInSearch BOOL } } } + + +// This message is sent from viewer -> simulator when the viewer wants +// to rez an object out of inventory back to its position before it +// last moved into the inventory +{ + RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated + { + AgentData Single + { AgentID LLUUID } + { SessionID LLUUID } + } + { + InventoryData Single + { 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 + { TransactionID LLUUID } + { Type S8 } + { InvType S8 } + { Flags U32 } + { SaleType U8 } + { SalePrice S32 } + { Name Variable 1 } + { Description Variable 1 } + { CreationDate S32 } + { CRC U32 } + } +}