Merge branch 'develop' into maxim/lua-nearby-avatars

2 files changed, 35 insertions, 2 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 1450c111c2..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!
 
 
@@ -9133,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 }
+	}
+}
+
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index efa5f3cf48..e38780dc92 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-d7915d67467e59287857630bd89bf9529d065199
\ No newline at end of file
+fb225888b50e4c525a33442538f0fe78bbe9cd43
\ No newline at end of file