diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 | 
| commit | 5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch) | |
| tree | cd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /scripts | |
| parent | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff) | |
| parent | 644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff) | |
merge up latest viewer-development (post mesh)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/messages/message_template.msg | 9 | ||||
| -rw-r--r-- | scripts/messages/message_template.msg.sha1 | 2 | 
2 files changed, 10 insertions, 1 deletions
| diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index d292653d3f..2cb0a833d4 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -2061,6 +2061,15 @@ version 2.0  		{	IsPhantom		BOOL	}  		{	CastsShadows	BOOL	}  	} +    { +		ExtraPhysics        Variable +		{   PhysicsShapeType U8     } +        {   Density          F32    } +        {   Friction         F32    } +        {   Restitution      F32    } +        {   GravityMultiplier    F32    } + +	}  } diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index 41e70011af..6486d92851 100644 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -ce3be58f4ea395c272fcfa3e6b6dad027c188e0d
\ No newline at end of file +465164e1a07f63d68c4ad1f00c19805dfb6ee2d7
\ No newline at end of file | 
