diff options
| author | Melanie | 2011-12-14 08:57:55 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-14 08:57:55 +0000 |
| commit | 898549d13e94643afe45ce12f33351abd70d5333 (patch) | |
| tree | be293f849a7c82442435048d565622fae4d69980 /bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |
| parent | Spin off terrain save into a new thread and make it so that it uses the old (diff) | |
| parent | Just adding a comment to SendFullUpdatToClient (diff) | |
| download | opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.zip opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.gz opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.bz2 opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index ecf2005..a4a0cba 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -281,12 +281,6 @@ | |||
| 281 | <Key Name="assetType" Value="0" /> | 281 | <Key Name="assetType" Value="0" /> |
| 282 | <Key Name="fileName" Value="wood1.jp2" /> | 282 | <Key Name="fileName" Value="wood1.jp2" /> |
| 283 | </Section> | 283 | </Section> |
| 284 | <Section Name="LOLCAT"> | ||
| 285 | <Key Name="assetID" Value="13371337-1337-1337-1337-133713371337" /> | ||
| 286 | <Key Name="name" Value="lolcat in ur assets" /> | ||
| 287 | <Key Name="assetType" Value="0" /> | ||
| 288 | <Key Name="fileName" Value="peaches.jp2" /> | ||
| 289 | </Section> | ||
| 290 | <Section Name="bricks"> | 284 | <Section Name="bricks"> |
| 291 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> | 285 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> |
| 292 | <Key Name="name" Value="bricks"/> | 286 | <Key Name="name" Value="bricks"/> |