diff options
| author | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
| commit | c8d65c359ffcccf2e0fb61fcc31c45072f14b773 (patch) | |
| tree | 0d5e0fe48ababacd820479f95b3ab2239ec2c84d /bin/assets/TexturesAssetSet | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| download | opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.zip opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.gz opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.bz2 opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 | ||||
| -rw-r--r-- | bin/assets/TexturesAssetSet/default_alpha.jp2 | bin | 0 -> 319 bytes |
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index c5cafa7..5484ee2 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -1,4 +1,10 @@ | |||
| 1 | <Nini> | 1 | <Nini> |
| 2 | <Section Name="Default Alpha"> | ||
| 3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> | ||
| 4 | <Key Name="name" Value="alpha" /> | ||
| 5 | <Key Name="assetType" Value="0" /> | ||
| 6 | <Key Name="fileName" Value="default_alpha.jp2" /> | ||
| 7 | </Section> | ||
| 2 | <Section Name="texture1"> | 8 | <Section Name="texture1"> |
| 3 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> | 9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> |
| 4 | <Key Name="name" Value="femface" /> | 10 | <Key Name="name" Value="femface" /> |
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 | |||