aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets
diff options
context:
space:
mode:
authorMelanie2011-12-14 08:57:55 +0000
committerMelanie2011-12-14 08:57:55 +0000
commit898549d13e94643afe45ce12f33351abd70d5333 (patch)
treebe293f849a7c82442435048d565622fae4d69980 /bin/assets
parentSpin off terrain save into a new thread and make it so that it uses the old (diff)
parentJust adding a comment to SendFullUpdatToClient (diff)
downloadopensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.zip
opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.gz
opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.bz2
opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin/assets')
-rw-r--r--bin/assets/TexturesAssetSet/TexturesAssetSet.xml6
-rw-r--r--bin/assets/TexturesAssetSet/peaches.jp2bin98845 -> 0 bytes
2 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"/>
diff --git a/bin/assets/TexturesAssetSet/peaches.jp2 b/bin/assets/TexturesAssetSet/peaches.jp2
deleted file mode 100644
index a3ec8f0..0000000
--- a/bin/assets/TexturesAssetSet/peaches.jp2
+++ /dev/null
Binary files differ