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.Framework.Interfaces
-namespace OpenSim.GridServers
 {
-        /// <summary>
+    /// <summary>
-        /// Description of IAssetServer.
+    /// Description of IAssetServer.
-        /// </summary>
+    /// </summary>
-        
-        public interface IAssetServer
+    public interface IAssetServer
-        {
+    {
-                void SetReceiver(IAssetReceiver receiver);
+        void SetReceiver(IAssetReceiver receiver);
-                void RequestAsset(LLUUID assetID, bool isTexture);
+        void RequestAsset(LLUUID assetID, bool isTexture);
-                void UpdateAsset(AssetBase asset);
+        void UpdateAsset(AssetBase asset);
-                void UploadNewAsset(AssetBase asset);
+        void UploadNewAsset(AssetBase asset);
-                void SetServerInfo(string ServerUrl, string ServerKey);
+        void SetServerInfo(string ServerUrl, string ServerKey);
-        }
+        void Close();
-        
+    }
-        // could change to delegate?
-        public interface IAssetReceiver
+    // could change to delegate?
-        {
+    public interface IAssetReceiver
-                void AssetReceived(AssetBase asset, bool IsTexture);
+    {
-                void AssetNotFound(AssetBase asset);
+        void AssetReceived(AssetBase asset, bool IsTexture);
-        }
+        void AssetNotFound(AssetBase asset);
-        
+    }
-        public struct ARequest
-        {
+    public interface IAssetPlugin
-                public LLUUID AssetID;
+    {
-                public bool IsTexture;
+        IAssetServer GetAssetServer();
-        }
+    }
-        
-        public class AssetBase
+    public struct ARequest
-        {
+    {
-                public byte[] Data;
+        public LLUUID AssetID;
-                public LLUUID FullID;
+        public bool IsTexture;
-                public sbyte Type;
+    }
-                public sbyte InvType;
-                public string Name;
-                public string Description;
-                
-                public AssetBase()
-                {
-                        
-                }
-        }
-        
-        public interface IAssetPlugin
-        {
-                IAssetServer GetAssetServer();
-        }
 }

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;
30	using System.IO;	30	using System.IO;
31	using System.Threading;	31	using System.Threading;
32	using libsecondlife;	32	using libsecondlife;
		33	using OpenSim.Framework.Assets;
33		34
34		35	namespace OpenSim.Framework.Interfaces
35	namespace OpenSim.GridServers
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// Description of IAssetServer.	38	/// Description of IAssetServer.
39	/// </summary>	39	/// </summary>
40		40
41	public interface IAssetServer	41	public interface IAssetServer
42	{	42	{
43	void SetReceiver(IAssetReceiver receiver);	43	void SetReceiver(IAssetReceiver receiver);
44	void RequestAsset(LLUUID assetID, bool isTexture);	44	void RequestAsset(LLUUID assetID, bool isTexture);
45	void UpdateAsset(AssetBase asset);	45	void UpdateAsset(AssetBase asset);
46	void UploadNewAsset(AssetBase asset);	46	void UploadNewAsset(AssetBase asset);
47	void SetServerInfo(string ServerUrl, string ServerKey);	47	void SetServerInfo(string ServerUrl, string ServerKey);
48	}	48	void Close();
49		49	}
50	// could change to delegate?	50
51	public interface IAssetReceiver	51	// could change to delegate?
52	{	52	public interface IAssetReceiver
53	void AssetReceived(AssetBase asset, bool IsTexture);	53	{
54	void AssetNotFound(AssetBase asset);	54	void AssetReceived(AssetBase asset, bool IsTexture);
55	}	55	void AssetNotFound(AssetBase asset);
56		56	}
57	public struct ARequest	57
58	{	58	public interface IAssetPlugin
59	public LLUUID AssetID;	59	{
60	public bool IsTexture;	60	IAssetServer GetAssetServer();
61	}	61	}
62		62
63	public class AssetBase	63	public struct ARequest
64	{	64	{
65	public byte[] Data;	65	public LLUUID AssetID;
66	public LLUUID FullID;	66	public bool IsTexture;
67	public sbyte Type;	67	}
68	public sbyte InvType;
69	public string Name;
70	public string Description;
71
72	public AssetBase()
73	{
74
75	}
76	}
77
78	public interface IAssetPlugin
79	{
80	IAssetServer GetAssetServer();
81	}
82	}	68	}