Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 39 insertions, 1 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index c019a76793..e1f22343be 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8,7 +8,7 @@ version 2.0
 // for each type is listed below:
 // Low: 430
 // Medium: 18
-// High: 30
+// High: 32
 // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
 
 
@@ -3607,6 +3607,11 @@ version 2.0
 		AppearanceHover		Variable
 		{	HoverHeight	LLVector3	}
 	}
+	{
+		AttachmentBlock		Variable
+		{	ID				    LLUUID  }
+		{	AttachmentPoint 		U8  }
+	}
 }
 
 // AvatarSitResponse - response to a request to sit on an object
@@ -9128,3 +9133,36 @@ version 2.0
 	}
 }
 
+// viewer->sim
+// GameControlInput - input from game controller
+// 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 last message.
+//
+// Any Button ommitted from the message is assumed by the receiving Simulator to be unpressed.
+//
+// Since GameControlInput messages are sent unreliably: whenenver the changes stop the last
+// message will be resent a few times in the hopes the server finally receives it.
+//
+{
+	GameControlInput High 32 NotTrusted Zerocoded
+	{
+		AgentData		Single
+		{	AgentID		LLUUID	}
+		{	SessionID	LLUUID	}
+	}
+	{
+		AxisData			Variable
+		{ Index				U8 }
+		{ Value				S16 }
+	}
+	{
+		ButtonData			Variable
+		{ Data				Variable 1 }
+	}
+}
+