3 files changed, 12 insertions, 29 deletions

diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 31cb379..9546891 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -26,15 +26,10 @@
 * 

 */

 using System;

-using System.Collections.Generic;

+using System.IO;

 using System.Net;

 using System.Text;

 using System.Text.RegularExpressions;

-using System.Threading;

-//using OpenSim.CAPS;

-using Nwc.XmlRpc;

-using System.Collections;

-using OpenSim.Framework.Console;

 using OpenSim.Framework.Servers;

 

 namespace OpenSim.Grid.AssetServer

@@ -69,9 +64,9 @@ namespace OpenSim.Grid.AssetServer
                 response.KeepAlive = false;

                 response.SendChunked = false;

 

-                System.IO.Stream body = request.InputStream;

-                System.Text.Encoding encoding = System.Text.Encoding.UTF8;

-                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);

+                Stream body = request.InputStream;

+                Encoding encoding = Encoding.UTF8;

+                StreamReader reader = new StreamReader(body, encoding);

 

                 string requestBody = reader.ReadToEnd();

                 body.Close();

@@ -114,7 +109,7 @@ namespace OpenSim.Grid.AssetServer
 

                 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);

                 byte[] buffer = Windows1252Encoding.GetBytes(responseString);

-                System.IO.Stream output = response.OutputStream;

+                Stream output = response.OutputStream;

                 response.SendChunked = false;

                 response.ContentLength64 = buffer.Length;

                 output.Write(buffer, 0, buffer.Length);

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index d06998d..112d72f 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -29,20 +29,10 @@
 using System;

 using System.IO;

 using System.Text;

-using System.Timers;

-using System.Net;

-using System.Reflection;

-using System.Threading;

+using Db4objects.Db4o;

 using libsecondlife;

-using OpenSim.Framework;

-using OpenSim.Framework.Sims;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Types;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Servers;

-using Db4objects.Db4o;

-using Db4objects.Db4o.Query;

 

 namespace OpenSim.Grid.AssetServer

 {

@@ -81,7 +71,7 @@ namespace OpenSim.Grid.AssetServer
         private OpenAsset_Main()

         {

             m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);

-            OpenSim.Framework.Console.MainLog.Instance = m_console;

+            MainLog.Instance = m_console;

         }

 

         public void Startup()

@@ -161,17 +151,17 @@ namespace OpenSim.Grid.AssetServer
 

         public void setupDB()

         {

-            bool yapfile = System.IO.File.Exists("assets.yap");

+            bool yapfile = File.Exists("assets.yap");

             try

             {

                 db = Db4oFactory.OpenFile("assets.yap");

-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");

+                MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");

             }

             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");

-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

+                MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");

+                MainLog.Instance.Warn(e.ToString());

             }

             if (!yapfile)

             {

@@ -273,7 +263,7 @@ namespace OpenSim.Grid.AssetServer
         {

 

 

-            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;

+            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;

             string fileName = Path.Combine(dataPath, filename);

             FileInfo fInfo = new FileInfo(fileName);

             long numBytes = fInfo.Length;

diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index f9a18a8..dc39ce2 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
 * 

 */

 using System.Reflection;

-using System.Runtime.CompilerServices;

 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.