From 8b01821dbacf1c54fd1d729d4fba6558564c1904 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 15 Oct 2007 04:27:52 +0000
Subject: * normalized line endings
---
.../Communications/Cache/SQLAssetServer.cs | 610 ++++++++++-----------
1 file changed, 305 insertions(+), 305 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 2a38307..082a240 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -1,310 +1,310 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.IO;
-using System.Threading;
-using System.Reflection;
-using libsecondlife;
-using Nini.Config;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-
-namespace OpenSim.Framework.Communications.Caches
-{
-
- public class SQLAssetServer : IAssetServer
- {
- private IAssetReceiver _receiver;
- private BlockingQueue<ARequest> _assetRequests;
- private Thread _localAssetServerThread;
- protected IAssetProvider m_assetProviderPlugin;
- private object syncLock = new object();
-
-
- public SQLAssetServer(string pluginName)
- {
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.IO;
+using System.Threading;
+using System.Reflection;
+using libsecondlife;
+using Nini.Config;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Framework.Communications.Caches
+{
+
+ public class SQLAssetServer : IAssetServer
+ {
+ private IAssetReceiver _receiver;
+ private BlockingQueue<ARequest> _assetRequests;
+ private Thread _localAssetServerThread;
+ protected IAssetProvider m_assetProviderPlugin;
+ private object syncLock = new object();
+
+
+ public SQLAssetServer(string pluginName)
+ {
_assetRequests = new BlockingQueue<ARequest>();
AddPlugin(pluginName);
- SetUpAssetDatabase();
-
- this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
- this._localAssetServerThread.IsBackground = true;
- this._localAssetServerThread.Start();
-
- }
-
- public void AddPlugin(string FileName)
- {
- MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);
- Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
-
- if (typeInterface != null)
- {
- IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- m_assetProviderPlugin = plug;
+ SetUpAssetDatabase();
+
+ this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
+ this._localAssetServerThread.IsBackground = true;
+ this._localAssetServerThread.Start();
+
+ }
+
+ public void AddPlugin(string FileName)
+ {
+ MainLog.Instance.Verbose("SQLAssetServer", "AssetStorage: Attempting to load " + FileName);
+ Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+ foreach (Type pluginType in pluginAssembly.GetTypes())
+ {
+ if (!pluginType.IsAbstract)
+ {
+ Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
+
+ if (typeInterface != null)
+ {
+ IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+ m_assetProviderPlugin = plug;
m_assetProviderPlugin.Initialise();
- MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
- }
-
- typeInterface = null;
- }
- }
-
- pluginAssembly = null;
- }
-
- public void SetReceiver(IAssetReceiver receiver)
- {
- this._receiver = receiver;
- }
-
- public void FetchAsset(LLUUID assetID, bool isTexture)
- {
- ARequest req = new ARequest();
- req.AssetID = assetID;
- req.IsTexture = isTexture;
- this._assetRequests.Enqueue(req);
- }
-
- public void UpdateAsset(AssetBase asset)
- {
- lock (syncLock)
- {
- m_assetProviderPlugin.UpdateAsset(asset);
- m_assetProviderPlugin.CommitAssets();
- }
- }
-
- public void CreateAsset(AssetBase asset)
- {
- lock (syncLock)
- {
- m_assetProviderPlugin.CreateAsset(asset);
- m_assetProviderPlugin.CommitAssets();
- }
- }
-
- public void SetServerInfo(string ServerUrl, string ServerKey)
- {
-
- }
- public void Close()
- {
- m_assetProviderPlugin.CommitAssets();
- }
-
- private void RunRequests()
- {
-
- while (true)
- {
- ARequest req = this._assetRequests.Dequeue();
-
- MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
-
- AssetBase asset = null;
- lock (syncLock)
- {
- asset = m_assetProviderPlugin.FetchAsset(req.AssetID);
- }
- if (asset != null)
- {
- _receiver.AssetReceived(asset, req.IsTexture);
- }
- else
- {
- _receiver.AssetNotFound(req.AssetID);
- }
-
- }
-
- }
-
- private void SetUpAssetDatabase()
- {
- MainLog.Instance.Verbose("Setting up asset database");
-
- AssetBase Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
- Image.Name = "Bricks";
- this.LoadAsset(Image, true, "bricks.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
- Image.Name = "Plywood";
- this.LoadAsset(Image, true, "plywood.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
- Image.Name = "Rocks";
- this.LoadAsset(Image, true, "rocks.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
- Image.Name = "Granite";
- this.LoadAsset(Image, true, "granite.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
- Image.Name = "Hardwood";
- this.LoadAsset(Image, true, "hardwood.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
- Image.Name = "Prim Base Texture";
- this.LoadAsset(Image, true, "plywood.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
- Image.Name = "Map Base Texture";
- this.LoadAsset(Image, true, "map_base.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
- Image.Name = "Map Texture";
- this.LoadAsset(Image, true, "map1.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
- Image.Name = "Female Body Texture";
- this.LoadAsset(Image, true, "femalebody.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
- Image.Name = "Female Bottom Texture";
- this.LoadAsset(Image, true, "femalebottom.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
- Image.Name = "Female Face Texture";
- this.LoadAsset(Image, true, "femaleface.jp2");
- m_assetProviderPlugin.CreateAsset(Image);
-
- 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");
- m_assetProviderPlugin.CreateAsset(Image);
-
- 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");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
- Image.Name = "Shirt";
- Image.Type = 5;
- Image.InvType = 18;
- this.LoadAsset(Image, false, "newshirt.dat");
- m_assetProviderPlugin.CreateAsset(Image);
-
- Image = new AssetBase();
- Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
- Image.Name = "Shirt";
- Image.Type = 5;
- Image.InvType = 18;
- this.LoadAsset(Image, false, "newpants.dat");
- m_assetProviderPlugin.CreateAsset(Image);
-
- string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
- if (File.Exists(filePath))
- {
- XmlConfigSource source = new XmlConfigSource(filePath);
- ReadAssetDetails(source);
- }
-
- m_assetProviderPlugin.CommitAssets();
- }
-
- protected void ReadAssetDetails(IConfigSource source)
- {
- AssetBase newAsset = null;
- for (int i = 0; i < source.Configs.Count; i++)
- {
- newAsset = new AssetBase();
- newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));
- newAsset.Name = source.Configs[i].GetString("name", "");
- newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0);
- newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
- string fileName = source.Configs[i].GetString("fileName", "");
- if (fileName != "")
- {
- MainLog.Instance.Verbose("Creating new asset: " + newAsset.Name);
- this.LoadAsset(newAsset, false, fileName);
- m_assetProviderPlugin.CreateAsset(newAsset);
- }
- }
- }
-
- private void LoadAsset(AssetBase info, bool image, string filename)
- {
- //should request Asset from storage manager
- //but for now read from file
-
- string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
- string fileName = Path.Combine(dataPath, filename);
- FileInfo fInfo = new FileInfo(fileName);
- long numBytes = fInfo.Length;
- FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
- byte[] idata = new byte[numBytes];
- BinaryReader br = new BinaryReader(fStream);
- idata = br.ReadBytes((int)numBytes);
- br.Close();
- fStream.Close();
- info.Data = idata;
- //info.loaded=true;
- }
- }
-
-}
+ MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
+ }
+
+ typeInterface = null;
+ }
+ }
+
+ pluginAssembly = null;
+ }
+
+ public void SetReceiver(IAssetReceiver receiver)
+ {
+ this._receiver = receiver;
+ }
+
+ public void FetchAsset(LLUUID assetID, bool isTexture)
+ {
+ ARequest req = new ARequest();
+ req.AssetID = assetID;
+ req.IsTexture = isTexture;
+ this._assetRequests.Enqueue(req);
+ }
+
+ public void UpdateAsset(AssetBase asset)
+ {
+ lock (syncLock)
+ {
+ m_assetProviderPlugin.UpdateAsset(asset);
+ m_assetProviderPlugin.CommitAssets();
+ }
+ }
+
+ public void CreateAsset(AssetBase asset)
+ {
+ lock (syncLock)
+ {
+ m_assetProviderPlugin.CreateAsset(asset);
+ m_assetProviderPlugin.CommitAssets();
+ }
+ }
+
+ public void SetServerInfo(string ServerUrl, string ServerKey)
+ {
+
+ }
+ public void Close()
+ {
+ m_assetProviderPlugin.CommitAssets();
+ }
+
+ private void RunRequests()
+ {
+
+ while (true)
+ {
+ ARequest req = this._assetRequests.Dequeue();
+
+ MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
+
+ AssetBase asset = null;
+ lock (syncLock)
+ {
+ asset = m_assetProviderPlugin.FetchAsset(req.AssetID);
+ }
+ if (asset != null)
+ {
+ _receiver.AssetReceived(asset, req.IsTexture);
+ }
+ else
+ {
+ _receiver.AssetNotFound(req.AssetID);
+ }
+
+ }
+
+ }
+
+ private void SetUpAssetDatabase()
+ {
+ MainLog.Instance.Verbose("Setting up asset database");
+
+ AssetBase Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
+ Image.Name = "Bricks";
+ this.LoadAsset(Image, true, "bricks.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
+ Image.Name = "Plywood";
+ this.LoadAsset(Image, true, "plywood.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
+ Image.Name = "Rocks";
+ this.LoadAsset(Image, true, "rocks.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
+ Image.Name = "Granite";
+ this.LoadAsset(Image, true, "granite.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
+ Image.Name = "Hardwood";
+ this.LoadAsset(Image, true, "hardwood.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
+ Image.Name = "Prim Base Texture";
+ this.LoadAsset(Image, true, "plywood.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
+ Image.Name = "Map Base Texture";
+ this.LoadAsset(Image, true, "map_base.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
+ Image.Name = "Map Texture";
+ this.LoadAsset(Image, true, "map1.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000010");
+ Image.Name = "Female Body Texture";
+ this.LoadAsset(Image, true, "femalebody.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000011");
+ Image.Name = "Female Bottom Texture";
+ this.LoadAsset(Image, true, "femalebottom.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-0000-1111-9999-000000000012");
+ Image.Name = "Female Face Texture";
+ this.LoadAsset(Image, true, "femaleface.jp2");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ 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");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ 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");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111110");
+ Image.Name = "Shirt";
+ Image.Type = 5;
+ Image.InvType = 18;
+ this.LoadAsset(Image, false, "newshirt.dat");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ Image = new AssetBase();
+ Image.FullID = new LLUUID("00000000-38f9-1111-024e-222222111120");
+ Image.Name = "Shirt";
+ Image.Type = 5;
+ Image.InvType = 18;
+ this.LoadAsset(Image, false, "newpants.dat");
+ m_assetProviderPlugin.CreateAsset(Image);
+
+ string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
+ if (File.Exists(filePath))
+ {
+ XmlConfigSource source = new XmlConfigSource(filePath);
+ ReadAssetDetails(source);
+ }
+
+ m_assetProviderPlugin.CommitAssets();
+ }
+
+ protected void ReadAssetDetails(IConfigSource source)
+ {
+ AssetBase newAsset = null;
+ for (int i = 0; i < source.Configs.Count; i++)
+ {
+ newAsset = new AssetBase();
+ newAsset.FullID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));
+ newAsset.Name = source.Configs[i].GetString("name", "");
+ newAsset.Type = (sbyte)source.Configs[i].GetInt("assetType", 0);
+ newAsset.InvType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
+ string fileName = source.Configs[i].GetString("fileName", "");
+ if (fileName != "")
+ {
+ MainLog.Instance.Verbose("Creating new asset: " + newAsset.Name);
+ this.LoadAsset(newAsset, false, fileName);
+ m_assetProviderPlugin.CreateAsset(newAsset);
+ }
+ }
+ }
+
+ private void LoadAsset(AssetBase info, bool image, string filename)
+ {
+ //should request Asset from storage manager
+ //but for now read from file
+
+ string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+ string fileName = Path.Combine(dataPath, filename);
+ FileInfo fInfo = new FileInfo(fileName);
+ long numBytes = fInfo.Length;
+ FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+ byte[] idata = new byte[numBytes];
+ BinaryReader br = new BinaryReader(fStream);
+ idata = br.ReadBytes((int)numBytes);
+ br.Close();
+ fStream.Close();
+ info.Data = idata;
+ //info.loaded=true;
+ }
+ }
+
+}
--
cgit v1.1