Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
author: BlueWall 2012-11-25 17:03:14 -0500
committer: BlueWall 2012-11-25 17:03:14 -0500
commit: c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree: dfa1c2020d5500d510519d5b2b3236600692f277 /bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
parent: Merge branch 'master' into connector_plugin (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
1 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" />
author	BlueWall	2012-11-25 17:03:14 -0500
committer	BlueWall	2012-11-25 17:03:14 -0500
commit	c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree	dfa1c2020d5500d510519d5b2b3236600692f277 /bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
parent	Merge branch 'master' into connector_plugin (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz

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 @@
303	<Key Name="fileName" Value="snd_TerrainStone.ogg" />	303	<Key Name="fileName" Value="snd_TerrainStone.ogg" />
304	</Section>	304	</Section>
305	<Section Name="snd_TerrainMetal">	305	<Section Name="snd_TerrainMetal">
306	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	306	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807201c9a66" />
307	<Key Name="name" Value="snd_TerrainMetal" />	307	<Key Name="name" Value="snd_TerrainMetal" />
308	<Key Name="assetType" Value="1" />	308	<Key Name="assetType" Value="1" />
309	<Key Name="fileName" Value="snd_TerrainMetal.ogg" />	309	<Key Name="fileName" Value="snd_TerrainMetal.ogg" />
310	</Section>	310	</Section>
311	<Section Name="snd_TerrainGlass">	311	<Section Name="snd_TerrainGlass">
312	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	312	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807202c9a66" />
313	<Key Name="name" Value="snd_TerrainGlass" />	313	<Key Name="name" Value="snd_TerrainGlass" />
314	<Key Name="assetType" Value="1" />	314	<Key Name="assetType" Value="1" />
315	<Key Name="fileName" Value="snd_TerrainGlass.ogg" />	315	<Key Name="fileName" Value="snd_TerrainGlass.ogg" />
316	</Section>	316	</Section>
317	<Section Name="snd_TerrainWood">	317	<Section Name="snd_TerrainWood">
318	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	318	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807203c9a66" />
319	<Key Name="name" Value="snd_TerrainWood" />	319	<Key Name="name" Value="snd_TerrainWood" />
320	<Key Name="assetType" Value="1" />	320	<Key Name="assetType" Value="1" />
321	<Key Name="fileName" Value="snd_TerrainWood.ogg" />	321	<Key Name="fileName" Value="snd_TerrainWood.ogg" />
322	</Section>	322	</Section>
323	<Section Name="snd_TerrainFlesh">	323	<Section Name="snd_TerrainFlesh">
324	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	324	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807204c9a66" />
325	<Key Name="name" Value="snd_TerrainFlesh" />	325	<Key Name="name" Value="snd_TerrainFlesh" />
326	<Key Name="assetType" Value="1" />	326	<Key Name="assetType" Value="1" />
327	<Key Name="fileName" Value="snd_TerrainFlesh.ogg" />	327	<Key Name="fileName" Value="snd_TerrainFlesh.ogg" />
328	</Section>	328	</Section>
329	<Section Name="snd_TerrainPlastic">	329	<Section Name="snd_TerrainPlastic">
330	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	330	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807205c9a66" />
331	<Key Name="name" Value="snd_TerrainPlastic" />	331	<Key Name="name" Value="snd_TerrainPlastic" />
332	<Key Name="assetType" Value="1" />	332	<Key Name="assetType" Value="1" />
333	<Key Name="fileName" Value="snd_TerrainPlastic.ogg" />	333	<Key Name="fileName" Value="snd_TerrainPlastic.ogg" />
334	</Section>	334	</Section>
335	<Section Name="snd_TerrainRubber">	335	<Section Name="snd_TerrainRubber">
336	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />	336	<Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807206c9a66" />
337	<Key Name="name" Value="snd_TerrainRubber" />	337	<Key Name="name" Value="snd_TerrainRubber" />
338	<Key Name="assetType" Value="1" />	338	<Key Name="assetType" Value="1" />
339	<Key Name="fileName" Value="snd_TerrainRubber.ogg" />	339	<Key Name="fileName" Value="snd_TerrainRubber.ogg" />