diff options
| author | Melanie | 2010-10-29 21:22:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 21:22:35 +0100 |
| commit | 69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e (patch) | |
| tree | 2a046b787abced2a1e68b1e62831e0b4f3778323 /bin/assets | |
| parent | Add my work on top of cmickeyb's (diff) | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| download | opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.zip opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.gz opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.bz2 opensim-SC_OLD-69c1e0b2f7cfaa195a8496aff1fb23c24a645c6e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/assets')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 2 | ||||
| -rw-r--r-- | bin/assets/TexturesAssetSet/default_alpha.jp2 | bin | 0 -> 319 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 7c74a48..5484ee2 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> | 3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> |
| 4 | <Key Name="name" Value="alpha" /> | 4 | <Key Name="name" Value="alpha" /> |
| 5 | <Key Name="assetType" Value="0" /> | 5 | <Key Name="assetType" Value="0" /> |
| 6 | <Key Name="fileName" Value="defaultalpha.jp2" /> | 6 | <Key Name="fileName" Value="default_alpha.jp2" /> |
| 7 | </Section> | 7 | </Section> |
| 8 | <Section Name="texture1"> | 8 | <Section Name="texture1"> |
| 9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> | 9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> |
diff --git a/bin/assets/TexturesAssetSet/default_alpha.jp2 b/bin/assets/TexturesAssetSet/default_alpha.jp2 new file mode 100644 index 0000000..af73c1e --- /dev/null +++ b/bin/assets/TexturesAssetSet/default_alpha.jp2 | |||
| Binary files differ | |||