Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts: # scripts/messages/message_template.msg # scripts/messages/message_template.msg.sha1master
Ansariel
commit
36a8432909
|
|
@ -6,7 +6,7 @@ version 2.0
|
|||
// numbers. Each message must be numbered relative to the
|
||||
// other messages of that type. The current highest number
|
||||
// for each type is listed below:
|
||||
// Low: 430
|
||||
// Low: 431
|
||||
// Medium: 18
|
||||
// High: 30
|
||||
// PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
|
||||
|
|
@ -1553,7 +1553,7 @@ version 2.0
|
|||
AgentData Single
|
||||
{ AgentID 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
|
||||
{ AgentID 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
|
||||
{ AgentID 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 }
|
||||
}
|
||||
{
|
||||
|
|
@ -1875,7 +1875,7 @@ version 2.0
|
|||
AgentData Single
|
||||
{ AgentID LLUUID }
|
||||
{ SessionID LLUUID }
|
||||
{ Force BOOL } // BOOL, god trying to force delete
|
||||
{ Force BOOL } // god trying to force delete
|
||||
}
|
||||
{
|
||||
ObjectData Variable
|
||||
|
|
@ -2106,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
|
||||
|
|
@ -2121,7 +2139,6 @@ version 2.0
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
ObjectShape Low 98 NotTrusted Zerocoded
|
||||
{
|
||||
|
|
@ -2184,7 +2201,7 @@ version 2.0
|
|||
}
|
||||
{
|
||||
HeaderData Single
|
||||
{ Override BOOL } // BOOL, God-bit.
|
||||
{ Override BOOL } // God-bit.
|
||||
{ OwnerID LLUUID }
|
||||
{ GroupID LLUUID }
|
||||
}
|
||||
|
|
@ -2255,7 +2272,7 @@ version 2.0
|
|||
{
|
||||
Data Single
|
||||
{ ObjectID LLUUID }
|
||||
{ Delete BOOL } // BOOL
|
||||
{ Delete BOOL }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2273,7 +2290,7 @@ version 2.0
|
|||
}
|
||||
{
|
||||
HeaderData Single
|
||||
{ Override BOOL } // BOOL, God-bit.
|
||||
{ Override BOOL } // God-bit.
|
||||
}
|
||||
{
|
||||
ObjectData Variable
|
||||
|
|
@ -2742,7 +2759,7 @@ version 2.0
|
|||
{ RunTime F32 } // F32
|
||||
{ SimFPS F32 } // F32
|
||||
{ FPS F32 } // F32
|
||||
{ AgentsInView U8 } //
|
||||
{ AgentsInView U8 }
|
||||
{ Ping F32 } // F32
|
||||
{ MetersTraveled F64 }
|
||||
{ RegionsVisited S32 }
|
||||
|
|
@ -2835,6 +2852,8 @@ version 2.0
|
|||
|
||||
// AlertMessage
|
||||
// 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
|
||||
{
|
||||
|
|
@ -3012,6 +3031,16 @@ version 2.0
|
|||
{ ChatShoutOffset F32 }
|
||||
{ ChatFlags U32 }
|
||||
}
|
||||
{
|
||||
CombatSettings Variable
|
||||
{ CombatFlags U32 }
|
||||
{ OnDeath U8 }
|
||||
{ DamageThrottle F32 }
|
||||
{ RegenerationRate F32 }
|
||||
{ InvulnerabilyTime F32 }
|
||||
{ DamageLimit F32 }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// GodUpdateRegionInfo
|
||||
|
|
@ -3268,7 +3297,7 @@ version 2.0
|
|||
{ ObjectData Variable 1 }
|
||||
|
||||
{ ParentID U32 }
|
||||
{ UpdateFlags U32 } // U32, see object_flags.h
|
||||
{ UpdateFlags U32 } // see object_flags.h
|
||||
|
||||
{ PathCurve U8 }
|
||||
{ ProfileCurve U8 }
|
||||
|
|
@ -3515,8 +3544,8 @@ version 2.0
|
|||
{ ID U64 }
|
||||
{ Filename Variable 1 }
|
||||
{ FilePath U8 } // ELLPath
|
||||
{ DeleteOnCompletion BOOL } // BOOL
|
||||
{ UseBigPackets BOOL } // BOOL
|
||||
{ DeleteOnCompletion BOOL }
|
||||
{ UseBigPackets BOOL }
|
||||
{ VFileID LLUUID }
|
||||
{ VFileType S16 }
|
||||
}
|
||||
|
|
@ -3584,6 +3613,7 @@ version 2.0
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
// AvatarAppearance - Update visual params
|
||||
{
|
||||
AvatarAppearance Low 158 Trusted Zerocoded
|
||||
|
|
@ -3751,7 +3781,6 @@ version 2.0
|
|||
}
|
||||
{
|
||||
ButtonData Variable
|
||||
|
||||
{ PayButton S32 }
|
||||
}
|
||||
}
|
||||
|
|
@ -4371,6 +4400,9 @@ version 2.0
|
|||
}
|
||||
|
||||
// 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
|
||||
{
|
||||
ScriptTeleportRequest Low 195 Trusted Unencoded
|
||||
|
|
@ -5326,7 +5358,7 @@ version 2.0
|
|||
{ AtAxis LLVector3 }
|
||||
{ LeftAxis LLVector3 }
|
||||
{ UpAxis LLVector3 }
|
||||
{ ChangedGrid BOOL } // BOOL
|
||||
{ ChangedGrid BOOL }
|
||||
|
||||
{ Far F32 }
|
||||
{ Aspect F32 }
|
||||
|
|
@ -5684,6 +5716,10 @@ version 2.0
|
|||
EstateBlock Single
|
||||
{ EstateID U32 }
|
||||
}
|
||||
{
|
||||
MetaData Variable
|
||||
{ Data Variable 2 }
|
||||
}
|
||||
}
|
||||
|
||||
// RetrieveInstantMessages - used to get instant messages that
|
||||
|
|
@ -6942,7 +6978,7 @@ version 2.0
|
|||
MoneyData Single
|
||||
{ AgentID LLUUID }
|
||||
{ TransactionID LLUUID }
|
||||
{ TransactionSuccess BOOL } // BOOL
|
||||
{ TransactionSuccess BOOL }
|
||||
{ MoneyBalance S32 }
|
||||
{ SquareMetersCredit S32 }
|
||||
{ SquareMetersCommitted S32 }
|
||||
|
|
@ -6981,7 +7017,7 @@ version 2.0
|
|||
MoneyData Single
|
||||
{ AgentID LLUUID }
|
||||
{ TransactionID LLUUID }
|
||||
{ TransactionSuccess BOOL } // BOOL
|
||||
{ TransactionSuccess BOOL }
|
||||
{ MoneyBalance S32 }
|
||||
{ SquareMetersCredit S32 }
|
||||
{ SquareMetersCommitted S32 }
|
||||
|
|
@ -7370,7 +7406,6 @@ version 2.0
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// *************************************************************************
|
||||
// Object animation messages
|
||||
// *************************************************************************
|
||||
|
|
@ -7441,8 +7476,8 @@ version 2.0
|
|||
{
|
||||
DataBlock Single
|
||||
{ ObjectID LLUUID }
|
||||
{ More U32 } //U32
|
||||
{ Time U32 } //U32
|
||||
{ More U32 }
|
||||
{ Time U32 }
|
||||
{ FromAddress Variable 1 }
|
||||
{ Subject Variable 1 }
|
||||
{ Data Variable 2 }
|
||||
|
|
@ -7504,8 +7539,8 @@ version 2.0
|
|||
{ Charter Variable 2 } // string
|
||||
{ ShowInList BOOL }
|
||||
{ InsigniaID LLUUID }
|
||||
{ MembershipFee S32 } // S32
|
||||
{ OpenEnrollment BOOL } // BOOL (U8)
|
||||
{ MembershipFee S32 }
|
||||
{ OpenEnrollment BOOL }
|
||||
{ AllowPublish BOOL } // whether profile is externally visible or not
|
||||
{ MaturePublish BOOL } // profile is "mature"
|
||||
}
|
||||
|
|
@ -7573,7 +7608,7 @@ version 2.0
|
|||
}
|
||||
|
||||
// JoinGroupRequest
|
||||
// viewer -> simulator
|
||||
// viewer -> simulator -> dataserver
|
||||
// reliable
|
||||
{
|
||||
JoinGroupRequest Low 343 NotTrusted Zerocoded
|
||||
|
|
@ -7746,11 +7781,11 @@ version 2.0
|
|||
{ Charter Variable 2 } // string
|
||||
{ ShowInList BOOL }
|
||||
{ MemberTitle Variable 1 } // string
|
||||
{ PowersMask U64 } // U32 mask
|
||||
{ PowersMask U64 }
|
||||
{ InsigniaID LLUUID }
|
||||
{ FounderID LLUUID }
|
||||
{ MembershipFee S32 }
|
||||
{ OpenEnrollment BOOL } // BOOL (U8)
|
||||
{ OpenEnrollment BOOL }
|
||||
{ Money S32 }
|
||||
{ GroupMembershipCount S32 }
|
||||
{ GroupRolesCount S32 }
|
||||
|
|
@ -8018,8 +8053,8 @@ version 2.0
|
|||
ProposalData Single
|
||||
{ GroupID LLUUID }
|
||||
{ Quorum S32 }
|
||||
{ Majority F32 } // F32
|
||||
{ Duration S32 } // S32, seconds
|
||||
{ Majority F32 }
|
||||
{ Duration S32 } // seconds
|
||||
{ ProposalText Variable 1 } // string
|
||||
}
|
||||
}
|
||||
|
|
@ -8338,13 +8373,13 @@ version 2.0
|
|||
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.
|
||||
{ SerialNum U32 } // Increases every time the wearables change for a given agent. Used to avoid processing out of order packets.
|
||||
}
|
||||
{
|
||||
WearableData Variable
|
||||
{ ItemID LLUUID }
|
||||
{ AssetID LLUUID }
|
||||
{ WearableType U8 } // U8, LLWearable::EWearType
|
||||
{ WearableType U8 } // LLWearable::EWearType
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -9215,9 +9250,43 @@ version 2.0
|
|||
{ Charter Variable 2 } // string
|
||||
{ ShowInList BOOL }
|
||||
{ InsigniaID LLUUID }
|
||||
{ MembershipFee S32 } // S32
|
||||
{ OpenEnrollment BOOL } // BOOL (U8)
|
||||
{ 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 }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
91e9b6acccc03f06506d3bc0d014ab05ef71eec1
|
||||
f0e9d30b03fe7823a7050cf1a86653e4de4bc256
|
||||
Loading…
Reference in New Issue