diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 67f983c09e..60b0b3fe9e 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -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: 423
+// Low: 429
 // Medium: 18
 // High: 29
 // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
@@ -460,7 +460,7 @@ version 2.0
 // that a given simulator is present and valid for a set amount of
 // time
 {
-	SetSimPresenceInDatabase Low 23 Trusted Unencoded
+	SetSimPresenceInDatabase Low 23 Trusted Unencoded UDPDeprecated
 	{
 		SimData Single
 		{   RegionID 	LLUUID	}
@@ -2064,11 +2064,10 @@ version 2.0
     {
 		ExtraPhysics        Variable
 		{   PhysicsShapeType U8     }
-        {   Density          F32    }
-        {   Friction         F32    }
-        {   Restitution      F32    }
-        {   GravityMultiplier    F32    }
-
+		{	Density			 F32	}
+		{	Friction		 F32	}
+		{	Restitution 	 F32	}
+		{	GravityMultiplier	 F32	}
 	}
 }
 
@@ -2847,6 +2846,10 @@ version 2.0
 		{	Message			Variable	1	}
 		{	ExtraParams		Variable	1	}
 	}
+    {
+        AgentInfo           Variable
+        {   AgentID         LLUUID  }
+    }
 }
 
 // Send an AlertMessage to the named agent.
@@ -4246,7 +4249,7 @@ version 2.0
 		{	Questions		S32	}
 	}
 	{
-		Experience	Single
+	Experience	Single
 		{	ExperienceID	LLUUID	}
 	}
 }
@@ -4440,7 +4443,7 @@ version 2.0
 // WARNING: This packet is potentially large.  With max length name,
 // description, music URL and media URL, it is 1526 + sizeof ( LLUUID ) bytes.
 {
-	ParcelProperties High 23 Trusted Zerocoded
+	ParcelProperties High 23 Trusted Zerocoded UDPDeprecated
 	{
 		ParcelData			Single
 		{	RequestResult	S32				}
@@ -4494,15 +4497,16 @@ version 2.0
 		{	RegionDenyAnonymous	BOOL		}
 		{	RegionDenyIdentified	BOOL		}
 		{	RegionDenyTransacted	BOOL		}
+		// in llsd message, SeeAVs, GroupAVSounds and AnyAVSounds BOOLs are also sent
 	}
 	{
 		AgeVerificationBlock Single
 		{   RegionDenyAgeUnverified BOOL    }
 	}
-    {
-        RegionAllowAccessBlock Single
-        {   RegionAllowAccessOverride BOOL  }  
-    }
+	{
+		RegionAllowAccessBlock Single
+		{   RegionAllowAccessOverride BOOL    }
+	}
 }
 
 // ParcelPropertiesUpdate
@@ -5266,6 +5270,10 @@ version 2.0
 		{	CanAcceptAgents		BOOL	}
 		{	CanAcceptTasks		BOOL	}
 	}
+	{
+		SimFlags				Single
+		{	Flags				U64 }
+	}
 }
 
 // Child Agent Update - agents send child agents to neighboring simulators.
@@ -5344,6 +5352,10 @@ version 2.0
 		AgentInfo				Variable
 		{	Flags					U32	}
 	}
+	{
+		AgentInventoryHost		Variable
+		{	InventoryHost		Variable	1	} //String
+	}
 }
 
 // ChildAgentAlive
@@ -5645,10 +5657,15 @@ version 2.0
 		{	Message			Variable	2	}
 		{	BinaryBucket	Variable	2	}
 	}
+	{
+		EstateBlock			Single
+		{	EstateID		U32	}
+	}
 }
 
 // RetrieveInstantMessages - used to get instant messages that
 // were persisted out to the database while the user was offline
+// Sent from viewer->simulator.   Also see RetrieveIMsExtended (back-end only)
 {
 	RetrieveInstantMessages Low 255 NotTrusted Unencoded
 	{
@@ -6540,6 +6557,11 @@ version 2.0
 		{	InventoryID		LLUUID	}
 		{	Type			S8	}
 	}
+	{
+		ValidationBlock		Single
+		{	NeedsValidation	BOOL	}
+		{	EstateID		U32	}
+	}
 }
 
 // dataserver -> sim
@@ -6885,7 +6907,7 @@ version 2.0
 // dataserver -> simulator -> spaceserver -> simulator -> viewer
 // reliable
 {
-	RoutedMoneyBalanceReply Low 315 Trusted Zerocoded
+	RoutedMoneyBalanceReply Low 315 Trusted Zerocoded UDPDeprecated
 	{
 		TargetBlock			Single
 		{	TargetIP		IPADDR	}	// U32 encoded IP
@@ -7381,7 +7403,6 @@ version 2.0
 
 // CreateGroupRequest
 // viewer -> simulator
-// simulator -> dataserver
 // reliable
 {
 	CreateGroupRequest Low 339 NotTrusted Zerocoded
@@ -7465,7 +7486,7 @@ version 2.0
 }
 
 // JoinGroupRequest
-// viewer -> simulator -> dataserver
+// viewer -> simulator
 // reliable
 {
 	JoinGroupRequest Low 343 NotTrusted Zerocoded
@@ -7596,10 +7617,14 @@ version 2.0
 		InviteData	Single
 		{	AgentID		LLUUID	}
 		{	InviteeID	LLUUID	}
-		{	GroupID			LLUUID	}
+		{	GroupID		LLUUID	}
 		{	RoleID		LLUUID	}
 		{	MembershipFee S32	}
 	}
+	{
+		GroupData	Single
+		{	GroupLimit    S32	}		// Extra block for the agent's group limit
+	}
 }
 
 // GroupProfileRequest
@@ -9055,3 +9080,57 @@ version 2.0
 	}
 }
 
+// RetrieveIMsExtended - extended version of RetrieveInstantMessages,
+//  used to get instant messages that were persisted out to the database while the user was offline
+//  sent between the simulator and dataserver
+{
+	RetrieveIMsExtended Low 427 Trusted Unencoded
+	{
+		AgentData 		Single
+		{   AgentID     LLUUID  }
+		{	SessionID	LLUUID	}
+		{	IsPremium	BOOL	}
+	}
+}
+
+// JoinGroupRequestExtended 
+// Extends JoinGroupRequest from viewer and passed to dataserver
+// simulator -> dataserver
+// reliable
+{
+	JoinGroupRequestExtended Low 428 Trusted Unencoded
+	{
+		AgentData	Single
+		{	AgentID		LLUUID	}
+		{	SessionID		LLUUID	}
+		{	GroupLimit		S32		}
+	}
+	{
+		GroupData	Single
+		{	GroupID		LLUUID	}
+	}
+}
+
+// CreateGroupRequestExtended
+// simulator -> dataserver, extends data from CreateGroupRequest
+// reliable
+{
+	CreateGroupRequestExtended Low 429 Trusted Unencoded
+	{
+		AgentData		Single
+		{	AgentID			LLUUID	}
+		{	SessionID		LLUUID	}
+		{	GroupLimit		S32		}
+	}
+	{
+		GroupData		Single
+		{	Name			Variable	1	}	// string
+		{	Charter			Variable	2	}	// string
+		{	ShowInList		BOOL	}
+		{	InsigniaID		LLUUID	}
+		{	MembershipFee	S32				}	// S32		
+		{	OpenEnrollment	BOOL			}   // BOOL (U8)
+		{	AllowPublish	BOOL		}	// whether profile is externally visible or not
+		{	MaturePublish	BOOL		}	// profile is "mature"
+	}
+}
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 06b5070f7a..553fbdcb7b 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-7d0f7714dd02a20ac934b400271fa42a5eaf3a4a
\ No newline at end of file
+8535acbfaf222a8e026283a74d869402a0458314
\ No newline at end of file