diff options
| author | Justin Clark-Casey (justincc) | 2012-06-08 00:22:18 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-08 00:24:39 +0100 |
| commit | af2954898edbf1250843120ea59168a26149d124 (patch) | |
| tree | 38c3dde02f29293e6a561d805ac97ffef03f7131 /bin/assets/AssetSets.xml | |
| parent | Fix bug with "kick user" reducing agent counts by 2 instead of 1. (diff) | |
| parent | Add collision sounds to the asset set (diff) | |
| download | opensim-SC-af2954898edbf1250843120ea59168a26149d124.zip opensim-SC-af2954898edbf1250843120ea59168a26149d124.tar.gz opensim-SC-af2954898edbf1250843120ea59168a26149d124.tar.bz2 opensim-SC-af2954898edbf1250843120ea59168a26149d124.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/assets/AssetSets.xml')
| -rw-r--r-- | bin/assets/AssetSets.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/assets/AssetSets.xml b/bin/assets/AssetSets.xml index c13ea42..829f845 100644 --- a/bin/assets/AssetSets.xml +++ b/bin/assets/AssetSets.xml | |||
| @@ -68,6 +68,12 @@ | |||
| 68 | <!----> | 68 | <!----> |
| 69 | 69 | ||
| 70 | <!----> | 70 | <!----> |
| 71 | <Section Name="Collision Sounds AssetSet"> | ||
| 72 | <Key Name="file" Value="CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml"/> | ||
| 73 | </Section> | ||
| 74 | <!----> | ||
| 75 | |||
| 76 | <!----> | ||
| 71 | <Section Name="Textures AssetSet"> | 77 | <Section Name="Textures AssetSet"> |
| 72 | <Key Name="file" Value="TexturesAssetSet/TexturesAssetSet.xml"/> | 78 | <Key Name="file" Value="TexturesAssetSet/TexturesAssetSet.xml"/> |
| 73 | </Section> | 79 | </Section> |