diff options
author | MW | 2007-07-26 17:41:31 +0000 |
---|---|---|
committer | MW | 2007-07-26 17:41:31 +0000 |
commit | f0dd115a8c5c44ebde4631df3469c6e39510325f (patch) | |
tree | 86d7557112d9e72d9084fc6b5d05cb6da86133a3 /OpenSim/Region | |
parent | * Started renaming world to Scene (diff) | |
download | opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.zip opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.gz opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.bz2 opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.xz |
More work on inventory and opensim library.
Fixed a number of bugs in the AssetCache related to asset downloading.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | 30 |
3 files changed, 43 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index feacadc..7e1820b 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -123,6 +123,14 @@ namespace OpenSim.Region.ClientStack | |||
123 | } | 123 | } |
124 | } | 124 | } |
125 | 125 | ||
126 | public LLUUID SessionId | ||
127 | { | ||
128 | get | ||
129 | { | ||
130 | return this.SessionID; | ||
131 | } | ||
132 | } | ||
133 | |||
126 | /// <summary> | 134 | /// <summary> |
127 | /// | 135 | /// |
128 | /// </summary> | 136 | /// </summary> |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index b8e6af5..dd30759 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -103,6 +103,11 @@ namespace SimpleApp | |||
103 | get { return myID; } | 103 | get { return myID; } |
104 | } | 104 | } |
105 | 105 | ||
106 | public LLUUID SessionId | ||
107 | { | ||
108 | get { return LLUUID.Zero; } | ||
109 | } | ||
110 | |||
106 | public virtual string FirstName | 111 | public virtual string FirstName |
107 | { | 112 | { |
108 | get { return "Annoying"; } | 113 | get { return "Annoying"; } |
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs index 7de9d55..919ad6c 100644 --- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | |||
@@ -259,8 +259,24 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
259 | db.Commit();*/ | 259 | db.Commit();*/ |
260 | 260 | ||
261 | Image = new AssetBase(); | 261 | Image = new AssetBase(); |
262 | Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); | ||
263 | Image.Name = "Skin"; | ||
264 | Image.Type = 13; | ||
265 | Image.InvType = 13; | ||
266 | this.LoadAsset(Image, false, "base_skin.dat"); | ||
267 | store = new AssetStorage(); | ||
268 | store.Data = Image.Data; | ||
269 | store.Name = Image.Name; | ||
270 | store.UUID = Image.FullID; | ||
271 | db.Set(store); | ||
272 | db.Commit(); | ||
273 | |||
274 | |||
275 | Image = new AssetBase(); | ||
262 | Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | 276 | Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); |
263 | Image.Name = "Shape"; | 277 | Image.Name = "Shape"; |
278 | Image.Type = 13; | ||
279 | Image.InvType = 13; | ||
264 | this.LoadAsset(Image, false, "base_shape.dat"); | 280 | this.LoadAsset(Image, false, "base_shape.dat"); |
265 | store = new AssetStorage(); | 281 | store = new AssetStorage(); |
266 | store.Data = Image.Data; | 282 | store.Data = Image.Data; |
@@ -268,6 +284,20 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
268 | store.UUID = Image.FullID; | 284 | store.UUID = Image.FullID; |
269 | db.Set(store); | 285 | db.Set(store); |
270 | db.Commit(); | 286 | db.Commit(); |
287 | |||
288 | Image = new AssetBase(); | ||
289 | Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001"); | ||
290 | Image.Name = "WelcomeNote"; | ||
291 | Image.Type = 7; | ||
292 | Image.InvType = 7; | ||
293 | this.LoadAsset(Image, false, "welcomeNote.dat"); | ||
294 | store = new AssetStorage(); | ||
295 | store.Data = Image.Data; | ||
296 | store.Name = Image.Name; | ||
297 | store.UUID = Image.FullID; | ||
298 | db.Set(store); | ||
299 | db.Commit(); | ||
300 | |||
271 | } | 301 | } |
272 | 302 | ||
273 | private void LoadAsset(AssetBase info, bool image, string filename) | 303 | private void LoadAsset(AssetBase info, bool image, string filename) |