diff options
| author | Melanie | 2011-02-07 22:08:53 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 22:08:53 +0000 |
| commit | 3889e68c5441218a2ffeb2094b8251d31369837b (patch) | |
| tree | 69608c869c3823df4f417d9df34866f400045533 /bin/assets | |
| parent | Repair x-query-string (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
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"/> |