diff options
author | Melanie | 2011-02-07 22:26:09 +0100 |
---|---|---|
committer | Melanie | 2011-02-07 22:26:09 +0100 |
commit | 8c20f94939347d504c175ca7afb6b456188cdf2c (patch) | |
tree | c11023fbc6e701b44128d2b54bd024abd912a1b3 /bin/assets | |
parent | Prevent a nonexistent inventory item from throwing an exception (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.zip opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.gz opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.bz2 opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'bin/assets')
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 5484ee2..3af9c99 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
@@ -413,6 +413,15 @@ | |||
413 | <Key Name="assetType" Value="0" /> | 413 | <Key Name="assetType" Value="0" /> |
414 | <Key Name="fileName" Value="default_clear.jp2" /> | 414 | <Key Name="fileName" Value="default_clear.jp2" /> |
415 | </Section> | 415 | </Section> |
416 | |||
417 | <!-- 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 is a UUID that viewers assume exists in the asset server --> | ||
418 | <!-- See http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 for more details --> | ||
419 | <Section Name="Default Alpha Layer Texture"> | ||
420 | <Key Name="assetID" Value="3a367d1c-bef1-6d43-7595-e88c1e3aadb3"/> | ||
421 | <Key Name="name" Value="Default Alpha Layer Texture"/> | ||
422 | <Key Name="assetType" Value="0" /> | ||
423 | <Key Name="fileName" Value="default_clear.jp2" /> | ||
424 | </Section> | ||
416 | 425 | ||
417 | <Section Name="Default Avatar"> | 426 | <Section Name="Default Avatar"> |
418 | <Key Name="assetID" Value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97"/> | 427 | <Key Name="assetID" Value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97"/> |