Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2061,7 +2061,7 @@ version 2.0
 		{	IsPhantom		BOOL	}
 		{	CastsShadows	BOOL	}
 	}
-    {
+	{
 		ExtraPhysics        Variable
 		{   PhysicsShapeType U8     }
        {   Density          F32    }
@@ -8654,6 +8654,11 @@ version 2.0
 		{	Agents		U8				}
 		{	MapImageID	LLUUID			}
 	}
+	{	
+		Size			Variable
+		{	SizeX		U16				}
+		{	SizeY		U16				}
+	}
 }

 // viewer -> sim