From f0dd115a8c5c44ebde4631df3469c6e39510325f Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 26 Jul 2007 17:41:31 +0000 Subject: More work on inventory and opensim library. Fixed a number of bugs in the AssetCache related to asset downloading. --- OpenSim/Region/ClientStack/ClientView.API.cs | 8 ++++++ .../Region/Examples/SimpleApp/MyNpcCharacter.cs | 5 ++++ .../GridInterfaces/Local/LocalAssetServer.cs | 30 ++++++++++++++++++++++ 3 files changed, 43 insertions(+) (limited to 'OpenSim/Region') 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 } } + public LLUUID SessionId + { + get + { + return this.SessionID; + } + } + /// /// /// 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 get { return myID; } } + public LLUUID SessionId + { + get { return LLUUID.Zero; } + } + public virtual string FirstName { 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 db.Commit();*/ Image = new AssetBase(); + Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); + Image.Name = "Skin"; + Image.Type = 13; + Image.InvType = 13; + this.LoadAsset(Image, false, "base_skin.dat"); + store = new AssetStorage(); + store.Data = Image.Data; + store.Name = Image.Name; + store.UUID = Image.FullID; + db.Set(store); + db.Commit(); + + + Image = new AssetBase(); Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); Image.Name = "Shape"; + Image.Type = 13; + Image.InvType = 13; this.LoadAsset(Image, false, "base_shape.dat"); store = new AssetStorage(); store.Data = Image.Data; @@ -268,6 +284,20 @@ namespace OpenSim.Region.GridInterfaces.Local store.UUID = Image.FullID; db.Set(store); db.Commit(); + + Image = new AssetBase(); + Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001"); + Image.Name = "WelcomeNote"; + Image.Type = 7; + Image.InvType = 7; + this.LoadAsset(Image, false, "welcomeNote.dat"); + store = new AssetStorage(); + store.Data = Image.Data; + store.Name = Image.Name; + store.UUID = Image.FullID; + db.Set(store); + db.Commit(); + } private void LoadAsset(AssetBase info, bool image, string filename) -- cgit v1.1