Merge branch 'master' of /var/git/opensim/

2010-10-29 14:10:10 -07:00 · 2010-10-29 14:10:10 -07:00 · 4a56ea8d88
parent 8d002c4553 4f39329d6f
commit 4a56ea8d88
2 changed files with 1 additions and 1 deletions
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@ -3,7 +3,7 @@
    <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" />
    <Key Name="name" Value="alpha" />
    <Key Name="assetType" Value="0" />
-    <Key Name="fileName" Value="defaultalpha.jp2" />
+    <Key Name="fileName" Value="default_alpha.jp2" />
  </Section>
  <Section Name="texture1">
    <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
--- a/bin/assets/TexturesAssetSet/default_alpha.jp2
+++ b/bin/assets/TexturesAssetSet/default_alpha.jp2