diff options
| author | Melanie | 2011-02-05 04:25:14 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-05 04:25:14 +0000 |
| commit | f78831ec9841eccea9ecb4077193e2ae7c3985c3 (patch) | |
| tree | b6118825d9dd4ebfc1f1f1f966009ac30b293af5 /bin/assets | |
| parent | Fix a typo in the QUERYACCESS method name (diff) | |
| parent | Added an additional debug message, and removed a bunch of files that weren't ... (diff) | |
| download | opensim-SC-f78831ec9841eccea9ecb4077193e2ae7c3985c3.zip opensim-SC-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.gz opensim-SC-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.bz2 opensim-SC-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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"/> |