Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs

5 files changed, 6 insertions, 6 deletions

diff --git a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
index 7498ae0..b570c55 100644
--- a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
+++ b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
@@ -303,37 +303,37 @@
     <Key Name="fileName" Value="snd_TerrainStone.ogg" />
   </Section>
   <Section Name="snd_TerrainMetal">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807201c9a66" />
     <Key Name="name" Value="snd_TerrainMetal" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainMetal.ogg" />
   </Section>
   <Section Name="snd_TerrainGlass">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807202c9a66" />
     <Key Name="name" Value="snd_TerrainGlass" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainGlass.ogg" />
   </Section>
   <Section Name="snd_TerrainWood">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807203c9a66" />
     <Key Name="name" Value="snd_TerrainWood" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainWood.ogg" />
   </Section>
   <Section Name="snd_TerrainFlesh">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807204c9a66" />
     <Key Name="name" Value="snd_TerrainFlesh" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainFlesh.ogg" />
   </Section>
   <Section Name="snd_TerrainPlastic">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807205c9a66" />
     <Key Name="name" Value="snd_TerrainPlastic" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainPlastic.ogg" />
   </Section>
   <Section Name="snd_TerrainRubber">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807206c9a66" />
     <Key Name="name" Value="snd_TerrainRubber" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainRubber.ogg" />
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index f976efe..fbc83e6 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index a00bc3a..65d3805 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index acaa9c8..936368a 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 996ea21..82fbad6 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so