diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /bin/assets | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 | ||||
| -rw-r--r-- | bin/assets/TexturesAssetSet/hg2.jp2 | bin | 0 -> 24574 bytes |
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 773de44..1d7f2a4 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -343,6 +343,12 @@ | |||
| 343 | <Key Name="assetType" Value="0" /> | 343 | <Key Name="assetType" Value="0" /> |
| 344 | <Key Name="fileName" Value="femaleface.jp2"/> | 344 | <Key Name="fileName" Value="femaleface.jp2"/> |
| 345 | </Section> | 345 | </Section> |
| 346 | <Section Name="Hyperlink Map Texture"> | ||
| 347 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000013"/> | ||
| 348 | <Key Name="name" Value="Hyperlink Map Texture"/> | ||
| 349 | <Key Name="assetType" Value="0" /> | ||
| 350 | <Key Name="fileName" Value="hg2.jp2"/> | ||
| 351 | </Section> | ||
| 346 | <Section Name="Moon"> | 352 | <Section Name="Moon"> |
| 347 | <Key Name="assetID" Value="ec4b9f0b-d008-45c6-96a4-01dd947ac621"/> | 353 | <Key Name="assetID" Value="ec4b9f0b-d008-45c6-96a4-01dd947ac621"/> |
| 348 | <Key Name="name" Value="Moon"/> | 354 | <Key Name="name" Value="Moon"/> |
diff --git a/bin/assets/TexturesAssetSet/hg2.jp2 b/bin/assets/TexturesAssetSet/hg2.jp2 new file mode 100644 index 0000000..9a66fd3 --- /dev/null +++ b/bin/assets/TexturesAssetSet/hg2.jp2 | |||
| Binary files differ | |||