diff options
| author | Melanie | 2012-06-07 23:34:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-07 23:34:22 +0100 |
| commit | 69dd5b855adb8178cc1057a645a2a6d433c2dc0f (patch) | |
| tree | 392a996bd1aeab76743288fcfd7300a1a58faac1 /bin/assets/AssetSets.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement playing of the real collision sounds, change scaling for avatar (diff) | |
| download | opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.zip opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.gz opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.bz2 opensim-SC-69dd5b855adb8178cc1057a645a2a6d433c2dc0f.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to '')
| -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> |