brought zircon branch into trunk

1 files changed, 33 insertions, 47 deletions

diff --git a/src/GridInterfaces/IAssetServer.cs b/OpenSim.Framework/IAssetServer.cs
index 6050a6c..a0de548 100644
--- a/src/GridInterfaces/IAssetServer.cs
+++ b/OpenSim.Framework/IAssetServer.cs
@@ -30,53 +30,39 @@ using System.Net.Sockets;
 using System.IO;

 using System.Threading;

 using libsecondlife;

+using OpenSim.Framework.Assets;

 

-

-namespace OpenSim.GridServers

+namespace OpenSim.Framework.Interfaces

 {

-        /// <summary>

-        /// Description of IAssetServer.

-        /// </summary>

-        

-        public interface IAssetServer

-        {

-                void SetReceiver(IAssetReceiver receiver);

-                void RequestAsset(LLUUID assetID, bool isTexture);

-                void UpdateAsset(AssetBase asset);

-                void UploadNewAsset(AssetBase asset);

-                void SetServerInfo(string ServerUrl, string ServerKey);

-        }

-        

-        // could change to delegate?

-        public interface IAssetReceiver

-        {

-                void AssetReceived(AssetBase asset, bool IsTexture);

-                void AssetNotFound(AssetBase asset);

-        }

-        

-        public struct ARequest

-        {

-                public LLUUID AssetID;

-                public bool IsTexture;

-        }

-        

-        public class AssetBase

-        {

-                public byte[] Data;

-                public LLUUID FullID;

-                public sbyte Type;

-                public sbyte InvType;

-                public string Name;

-                public string Description;

-                

-                public AssetBase()

-                {

-                        

-                }

-        }

-        

-        public interface IAssetPlugin

-        {

-                IAssetServer GetAssetServer();

-        }

+    /// <summary>

+    /// Description of IAssetServer.

+    /// </summary>

+

+    public interface IAssetServer

+    {

+        void SetReceiver(IAssetReceiver receiver);

+        void RequestAsset(LLUUID assetID, bool isTexture);

+        void UpdateAsset(AssetBase asset);

+        void UploadNewAsset(AssetBase asset);

+        void SetServerInfo(string ServerUrl, string ServerKey);

+        void Close();

+    }

+

+    // could change to delegate?

+    public interface IAssetReceiver

+    {

+        void AssetReceived(AssetBase asset, bool IsTexture);

+        void AssetNotFound(AssetBase asset);

+    }

+

+    public interface IAssetPlugin

+    {

+        IAssetServer GetAssetServer();

+    }

+

+    public struct ARequest

+    {

+        public LLUUID AssetID;

+        public bool IsTexture;

+    }

 }