diff options
| author | Adam Frisby | 2007-07-16 20:44:41 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-07-16 20:44:41 +0000 |
| commit | de1dd0e42fca431507e594f357dc953ee8dea837 (patch) | |
| tree | c904e28a33a7771f52c0f75d295ecabe903e7c2d | |
| parent | *No Hippos :( (diff) | |
| download | opensim-SC-de1dd0e42fca431507e594f357dc953ee8dea837.zip opensim-SC-de1dd0e42fca431507e594f357dc953ee8dea837.tar.gz opensim-SC-de1dd0e42fca431507e594f357dc953ee8dea837.tar.bz2 opensim-SC-de1dd0e42fca431507e594f357dc953ee8dea837.tar.xz | |
* In ur trunk adding ur assets.
| -rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 11 | ||||
| -rw-r--r-- | bin/assets/peaches.jp2 | bin | 0 -> 98845 bytes |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 5093f4d..f29a540 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
| @@ -246,6 +246,17 @@ namespace OpenSim.Grid.AssetServer | |||
| 246 | db.Commit(); | 246 | db.Commit(); |
| 247 | 247 | ||
| 248 | Image = new AssetBase(); | 248 | Image = new AssetBase(); |
| 249 | Image.FullID = new LLUUID("13371337-1337-1337-1337-133713371337"); | ||
| 250 | Image.Name = "Peaches"; | ||
| 251 | this.LoadAsset(Image, true, "peaches.jp2"); | ||
| 252 | store = new AssetStorage(); | ||
| 253 | store.Data = Image.Data; | ||
| 254 | store.Name = Image.Name; | ||
| 255 | store.UUID = Image.FullID; | ||
| 256 | db.Set(store); | ||
| 257 | db.Commit(); | ||
| 258 | |||
| 259 | Image = new AssetBase(); | ||
| 249 | Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | 260 | Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); |
| 250 | Image.Name = "Shape"; | 261 | Image.Name = "Shape"; |
| 251 | this.LoadAsset(Image, false, "base_shape.dat"); | 262 | this.LoadAsset(Image, false, "base_shape.dat"); |
diff --git a/bin/assets/peaches.jp2 b/bin/assets/peaches.jp2 new file mode 100644 index 0000000..a3ec8f0 --- /dev/null +++ b/bin/assets/peaches.jp2 | |||
| Binary files differ | |||