From 2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 16 Jul 2007 15:40:11 +0000
Subject: changed to native line ending encoding
---
OpenSim/Grid/AssetServer/Main.cs | 812 ++++++++++-----------
.../Grid/AssetServer/Properties/AssemblyInfo.cs | 116 +--
2 files changed, 464 insertions(+), 464 deletions(-)
(limited to 'OpenSim/Grid/AssetServer')
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4126ff4..5093f4d 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -1,406 +1,406 @@
-/*
-* 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.Text;
-using Db4objects.Db4o;
-using libsecondlife;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Grid.AssetServer
-{
- ///
- /// An asset server
- ///
- public class OpenAsset_Main : conscmd_callback
- {
- private IObjectContainer db;
-
- public static OpenAsset_Main assetserver;
-
- private LogBase m_console;
-
- [STAThread]
- public static void Main(string[] args)
- {
- Console.WriteLine("Starting...\n");
-
- assetserver = new OpenAsset_Main();
- assetserver.Startup();
-
- assetserver.Work();
- }
-
- private void Work()
- {
- m_console.Notice("Enter help for a list of commands");
-
- while (true)
- {
- m_console.MainLogPrompt();
- }
- }
-
- private OpenAsset_Main()
- {
- m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
- MainLog.Instance = m_console;
- }
-
- public void Startup()
- {
- m_console.Verbose("Main.cs:Startup() - Setting up asset DB");
- setupDB();
-
- m_console.Verbose("Main.cs:Startup() - Starting HTTP process");
- BaseHttpServer httpServer = new BaseHttpServer(8003);
-
- httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
- httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
-
- //httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
- //httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
-
- httpServer.Start();
-
- }
-
- //public string AssetPostMethod(string requestBody, string path, string param)
- //{
- // AssetBase asset = new AssetBase();
- // asset.Name = "";
- // asset.FullID = new LLUUID(param);
- // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
- // byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
- // asset.Data = buffer;
- // AssetStorage store = new AssetStorage();
- // store.Data = asset.Data;
- // store.Name = asset.Name;
- // store.UUID = asset.FullID;
- // db.Set(store);
- // db.Commit();
- // return "";
- //}
-
- //public string AssetGetMethod(string request, string path, string param)
- //{
- // Console.WriteLine("got a request " + param);
- // byte[] assetdata = GetAssetData(new LLUUID(param), false);
- // if (assetdata != null)
- // {
- // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
- // string ret = Windows1252Encoding.GetString(assetdata);
- // //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
-
- // return ret;
-
- // }
- // else
- // {
- // return "";
- // }
-
- //}
-
- public byte[] GetAssetData(LLUUID assetID, bool isTexture)
- {
- bool found = false;
- AssetStorage foundAsset = null;
-
- IObjectSet result = db.Get(new AssetStorage(assetID));
- if (result.Count > 0)
- {
- foundAsset = (AssetStorage)result.Next();
- found = true;
- }
-
- if (found)
- {
- return foundAsset.Data;
- }
- else
- {
- return null;
- }
- }
-
- public void setupDB()
- {
- bool yapfile = File.Exists("gridassets.yap");
- try
- {
- db = Db4oFactory.OpenFile("gridassets.yap");
- MainLog.Instance.Verbose("Main.cs:setupDB() - creation");
- }
- catch (Exception e)
- {
- db.Close();
- MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
- MainLog.Instance.Warn(e.ToString());
- }
- if (!yapfile)
- {
- this.LoadDB();
- }
- }
-
- public void LoadDB()
- {
- try
- {
-
- Console.WriteLine("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");
- AssetStorage 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("00000000-0000-0000-9999-000000000002");
- Image.Name = "Plywood";
- this.LoadAsset(Image, true, "plywood.jp2");
- 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("00000000-0000-0000-9999-000000000003");
- Image.Name = "Rocks";
- this.LoadAsset(Image, true, "rocks.jp2");
- 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("00000000-0000-0000-9999-000000000004");
- Image.Name = "Granite";
- this.LoadAsset(Image, true, "granite.jp2");
- 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("00000000-0000-0000-9999-000000000005");
- Image.Name = "Hardwood";
- this.LoadAsset(Image, true, "hardwood.jp2");
- 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("00000000-0000-0000-5005-000000000005");
- Image.Name = "Prim Base Texture";
- this.LoadAsset(Image, true, "plywood.jp2");
- 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";
- this.LoadAsset(Image, false, "base_shape.dat");
- store = new AssetStorage();
- store.Data = Image.Data;
- store.Name = Image.Name;
- store.UUID = Image.FullID;
- db.Set(store);
- db.Commit();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
-
- private void LoadAsset(AssetBase info, bool image, string filename)
- {
-
-
- 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;
- }
-
- /*private GridConfig LoadConfigDll(string dllName)
- {
- Assembly pluginAssembly = Assembly.LoadFrom(dllName);
- GridConfig config = null;
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("IGridConfig", true);
-
- if (typeInterface != null)
- {
- IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- config = plug.GetConfigObject();
- break;
- }
-
- typeInterface = null;
- }
- }
- }
- pluginAssembly = null;
- return config;
- }*/
-
- public void CreateAsset(LLUUID assetId, byte[] assetData)
- {
- AssetBase asset = new AssetBase();
- asset.Name = "";
- asset.FullID = assetId;
- asset.Data = assetData;
-
- AssetStorage store = new AssetStorage();
- store.Data = asset.Data;
- store.Name = asset.Name;
- store.UUID = asset.FullID;
- db.Set(store);
- db.Commit();
- }
-
- public void RunCmd(string cmd, string[] cmdparams)
- {
- switch (cmd)
- {
- case "help":
- m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
- break;
-
- case "shutdown":
- m_console.Close();
- Environment.Exit(0);
- break;
- }
- }
-
- public void Show(string ShowWhat)
- {
- }
- }
-
- public class GetAssetStreamHandler : BaseStreamHandler
- {
- OpenAsset_Main m_assetManager;
-
- override public byte[] Handle(string path, Stream request)
- {
- string param = GetParam(path);
-
- byte[] assetdata = m_assetManager.GetAssetData(new LLUUID(param), false);
- if (assetdata != null)
- {
- return assetdata;
- }
- else
- {
- return new byte[]{};
- }
- }
-
- public GetAssetStreamHandler(OpenAsset_Main assetManager):base( "/assets/", "GET")
- {
- m_assetManager = assetManager;
- }
- }
-
- public class PostAssetStreamHandler : BaseStreamHandler
- {
- OpenAsset_Main m_assetManager;
-
- override public byte[] Handle(string path, Stream request)
- {
- string param = GetParam(path);
- LLUUID assetId = new LLUUID(param);
- byte[] txBuffer = new byte[4096];
-
- using( BinaryReader binReader = new BinaryReader( request ) )
- {
- using (MemoryStream memoryStream = new MemoryStream(4096))
- {
- int count;
- while ((count = binReader.Read(txBuffer, 0, 4096)) > 0)
- {
- memoryStream.Write(txBuffer, 0, count);
- }
-
- byte[] assetData = memoryStream.ToArray();
-
- m_assetManager.CreateAsset(assetId, assetData);
- }
- }
-
- return new byte[]{};
- }
-
- public PostAssetStreamHandler( OpenAsset_Main assetManager )
- : base("/assets/", "POST")
- {
- m_assetManager = assetManager;
- }
- }
-}
+/*
+* 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.Text;
+using Db4objects.Db4o;
+using libsecondlife;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Grid.AssetServer
+{
+ ///
+ /// An asset server
+ ///
+ public class OpenAsset_Main : conscmd_callback
+ {
+ private IObjectContainer db;
+
+ public static OpenAsset_Main assetserver;
+
+ private LogBase m_console;
+
+ [STAThread]
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Starting...\n");
+
+ assetserver = new OpenAsset_Main();
+ assetserver.Startup();
+
+ assetserver.Work();
+ }
+
+ private void Work()
+ {
+ m_console.Notice("Enter help for a list of commands");
+
+ while (true)
+ {
+ m_console.MainLogPrompt();
+ }
+ }
+
+ private OpenAsset_Main()
+ {
+ m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
+ MainLog.Instance = m_console;
+ }
+
+ public void Startup()
+ {
+ m_console.Verbose("Main.cs:Startup() - Setting up asset DB");
+ setupDB();
+
+ m_console.Verbose("Main.cs:Startup() - Starting HTTP process");
+ BaseHttpServer httpServer = new BaseHttpServer(8003);
+
+ httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
+ httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
+
+ //httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
+ //httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
+
+ httpServer.Start();
+
+ }
+
+ //public string AssetPostMethod(string requestBody, string path, string param)
+ //{
+ // AssetBase asset = new AssetBase();
+ // asset.Name = "";
+ // asset.FullID = new LLUUID(param);
+ // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+ // byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
+ // asset.Data = buffer;
+ // AssetStorage store = new AssetStorage();
+ // store.Data = asset.Data;
+ // store.Name = asset.Name;
+ // store.UUID = asset.FullID;
+ // db.Set(store);
+ // db.Commit();
+ // return "";
+ //}
+
+ //public string AssetGetMethod(string request, string path, string param)
+ //{
+ // Console.WriteLine("got a request " + param);
+ // byte[] assetdata = GetAssetData(new LLUUID(param), false);
+ // if (assetdata != null)
+ // {
+ // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+ // string ret = Windows1252Encoding.GetString(assetdata);
+ // //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
+
+ // return ret;
+
+ // }
+ // else
+ // {
+ // return "";
+ // }
+
+ //}
+
+ public byte[] GetAssetData(LLUUID assetID, bool isTexture)
+ {
+ bool found = false;
+ AssetStorage foundAsset = null;
+
+ IObjectSet result = db.Get(new AssetStorage(assetID));
+ if (result.Count > 0)
+ {
+ foundAsset = (AssetStorage)result.Next();
+ found = true;
+ }
+
+ if (found)
+ {
+ return foundAsset.Data;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public void setupDB()
+ {
+ bool yapfile = File.Exists("gridassets.yap");
+ try
+ {
+ db = Db4oFactory.OpenFile("gridassets.yap");
+ MainLog.Instance.Verbose("Main.cs:setupDB() - creation");
+ }
+ catch (Exception e)
+ {
+ db.Close();
+ MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
+ }
+ if (!yapfile)
+ {
+ this.LoadDB();
+ }
+ }
+
+ public void LoadDB()
+ {
+ try
+ {
+
+ Console.WriteLine("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");
+ AssetStorage 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("00000000-0000-0000-9999-000000000002");
+ Image.Name = "Plywood";
+ this.LoadAsset(Image, true, "plywood.jp2");
+ 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("00000000-0000-0000-9999-000000000003");
+ Image.Name = "Rocks";
+ this.LoadAsset(Image, true, "rocks.jp2");
+ 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("00000000-0000-0000-9999-000000000004");
+ Image.Name = "Granite";
+ this.LoadAsset(Image, true, "granite.jp2");
+ 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("00000000-0000-0000-9999-000000000005");
+ Image.Name = "Hardwood";
+ this.LoadAsset(Image, true, "hardwood.jp2");
+ 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("00000000-0000-0000-5005-000000000005");
+ Image.Name = "Prim Base Texture";
+ this.LoadAsset(Image, true, "plywood.jp2");
+ 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";
+ this.LoadAsset(Image, false, "base_shape.dat");
+ store = new AssetStorage();
+ store.Data = Image.Data;
+ store.Name = Image.Name;
+ store.UUID = Image.FullID;
+ db.Set(store);
+ db.Commit();
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.Message);
+ }
+ }
+
+ private void LoadAsset(AssetBase info, bool image, string filename)
+ {
+
+
+ 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;
+ }
+
+ /*private GridConfig LoadConfigDll(string dllName)
+ {
+ Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+ GridConfig config = null;
+
+ foreach (Type pluginType in pluginAssembly.GetTypes())
+ {
+ if (pluginType.IsPublic)
+ {
+ if (!pluginType.IsAbstract)
+ {
+ Type typeInterface = pluginType.GetInterface("IGridConfig", true);
+
+ if (typeInterface != null)
+ {
+ IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+ config = plug.GetConfigObject();
+ break;
+ }
+
+ typeInterface = null;
+ }
+ }
+ }
+ pluginAssembly = null;
+ return config;
+ }*/
+
+ public void CreateAsset(LLUUID assetId, byte[] assetData)
+ {
+ AssetBase asset = new AssetBase();
+ asset.Name = "";
+ asset.FullID = assetId;
+ asset.Data = assetData;
+
+ AssetStorage store = new AssetStorage();
+ store.Data = asset.Data;
+ store.Name = asset.Name;
+ store.UUID = asset.FullID;
+ db.Set(store);
+ db.Commit();
+ }
+
+ public void RunCmd(string cmd, string[] cmdparams)
+ {
+ switch (cmd)
+ {
+ case "help":
+ m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
+ break;
+
+ case "shutdown":
+ m_console.Close();
+ Environment.Exit(0);
+ break;
+ }
+ }
+
+ public void Show(string ShowWhat)
+ {
+ }
+ }
+
+ public class GetAssetStreamHandler : BaseStreamHandler
+ {
+ OpenAsset_Main m_assetManager;
+
+ override public byte[] Handle(string path, Stream request)
+ {
+ string param = GetParam(path);
+
+ byte[] assetdata = m_assetManager.GetAssetData(new LLUUID(param), false);
+ if (assetdata != null)
+ {
+ return assetdata;
+ }
+ else
+ {
+ return new byte[]{};
+ }
+ }
+
+ public GetAssetStreamHandler(OpenAsset_Main assetManager):base( "/assets/", "GET")
+ {
+ m_assetManager = assetManager;
+ }
+ }
+
+ public class PostAssetStreamHandler : BaseStreamHandler
+ {
+ OpenAsset_Main m_assetManager;
+
+ override public byte[] Handle(string path, Stream request)
+ {
+ string param = GetParam(path);
+ LLUUID assetId = new LLUUID(param);
+ byte[] txBuffer = new byte[4096];
+
+ using( BinaryReader binReader = new BinaryReader( request ) )
+ {
+ using (MemoryStream memoryStream = new MemoryStream(4096))
+ {
+ int count;
+ while ((count = binReader.Read(txBuffer, 0, 4096)) > 0)
+ {
+ memoryStream.Write(txBuffer, 0, count);
+ }
+
+ byte[] assetData = memoryStream.ToArray();
+
+ m_assetManager.CreateAsset(assetId, assetData);
+ }
+ }
+
+ return new byte[]{};
+ }
+
+ public PostAssetStreamHandler( OpenAsset_Main assetManager )
+ : base("/assets/", "POST")
+ {
+ m_assetManager = assetManager;
+ }
+ }
+}
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index dc39ce2..f9b48d5 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -1,58 +1,58 @@
-/*
-* 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.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OGS-AssetServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OGS-AssetServer")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+/*
+* 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.Reflection;
+using System.Runtime.InteropServices;
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OGS-AssetServer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OGS-AssetServer")]
+[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--
cgit v1.1