Merge branch 'develop' into marchcat/c-develop

# Conflicts:
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml

2 files changed, 21 insertions, 9 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index e1f22343be..d7cdb28f2c 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -4370,14 +4370,18 @@ version 2.0
 // ScriptTeleportRequest
 // reliable
 {
-	ScriptTeleportRequest Low 195 Trusted Unencoded
-	{
-		Data	Single
-		{	ObjectName		Variable	1	}
-		{	SimName			Variable	1	}
-		{	SimPosition		LLVector3		}
-		{	LookAt			LLVector3		}
-	}
+    ScriptTeleportRequest Low 195 Trusted Unencoded
+    {
+        Data	Single
+        {   ObjectName      Variable	1	}
+        {   SimName         Variable	1	}
+        {   SimPosition     LLVector3		}
+        {   LookAt          LLVector3		}
+    }
+    {
+        Options Variable
+        {   Flags           U32 }
+    }
 }
 
 
@@ -5664,6 +5668,14 @@ version 2.0
 		{	Message			Variable	2	}
 		{	BinaryBucket	Variable	2	}
 	}
+	{
+		EstateBlock			Single
+		{	EstateID		U32	}
+	}
+	{
+		MetaData			Variable
+		{	Data			Variable	2	}
+	}
 }
 
 // RetrieveInstantMessages - used to get instant messages that
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index e38780dc92..f7f26d3cf6 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-fb225888b50e4c525a33442538f0fe78bbe9cd43
\ No newline at end of file
+0d9706a9dfe23358140642a21db48980b3d016b2
\ No newline at end of file