1 files changed, 46 insertions, 54 deletions
diff --git a/src/GridInterfaces/ILocalStorage.cs b/OpenSim.Framework/IGridServer.cs
index 6b7ded6..026dfab 100644
--- a/src/GridInterfaces/ILocalStorage.cs
+++ b/OpenSim.Framework/IGridServer.cs
@@ -25,62 +25,54 @@
 * 
 */
 using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
 using libsecondlife;
+using OpenSim;
-namespace GridInterfaces
+namespace OpenSim.Framework.Interfaces
 {
-        /// <summary>
+    /// <summary>
-        /// ILocalStorage. Really hacked together right now needs cleaning up
+    /// Handles connection to Grid Servers.
-        /// </summary>
+    /// also Sim to Sim connections?
-        public interface ILocalStorage
+    /// </summary>
-        {
-                void StorePrim(PrimData prim);
+    public interface IGridServer
-                void RemovePrim(LLUUID primID);
+    {
-                void LoadPrimitives(ILocalStorageReceiver receiver);
+        UUIDBlock RequestUUIDBlock();
-                void ShutDown();
+        NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions
-        }
+        AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        
+        bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public interface ILocalStorageReceiver
+        string GetName();
-        {
+        bool RequestConnection();
-                void PrimFromStorage(PrimData prim);
+        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        }
+        void Close();
-        
+    }
-        
+    
-        public class PrimData
+    public struct UUIDBlock
-        {
+    {
-                public LLUUID OwnerID;
+        public LLUUID BlockStart;
-                public byte PCode;
+        public LLUUID BlockEnd;
-                public byte PathBegin;
+    }
-                public byte PathEnd;
-                public byte PathScaleX;
+    public class AuthenticateResponse
-                public byte PathScaleY;
+    {
-                public byte PathShearX;
+        public bool Authorised;
-                public byte PathShearY;
+        public Login LoginInfo;
-                public sbyte PathSkew;
-                public byte ProfileBegin;
+        public AuthenticateResponse()
-                public byte ProfileEnd;
+        {
-                public LLVector3 Scale;
-                public byte PathCurve;
+        }
-                public byte ProfileCurve;
-                public uint ParentID=0;
+    }
-                public byte ProfileHollow;
-                public sbyte PathRadiusOffset;
+    public interface IGridPlugin
-        public byte PathRevolutions;
+    {
-        public sbyte PathTaperX;
+        IGridServer GetGridServer();
-        public sbyte PathTaperY;
+    }
-        public sbyte PathTwist;
-        public sbyte PathTwistBegin;
-        
-        //following only used during prim storage
-        public LLVector3 Position;
-                public LLQuaternion Rotation;
-                public uint LocalID;
-                public LLUUID FullID;
-                
-                public PrimData()
-                {
-                        
-                }
-        }
 }

diff --git a/src/GridInterfaces/ILocalStorage.cs b/OpenSim.Framework/IGridServer.cs index 6b7ded6..026dfab 100644 --- a/src/GridInterfaces/ILocalStorage.cs +++ b/OpenSim.Framework/IGridServer.cs
@@ -25,62 +25,54 @@
25	*	25	*
26	*/	26	*/
27		27
		28
28	using System;	29	using System;
		30	using System.Collections.Generic;
		31	using System.Net;
		32	using System.Net.Sockets;
		33	using System.IO;
29	using libsecondlife;	34	using libsecondlife;
		35	using OpenSim;
30		36
31	namespace GridInterfaces	37	namespace OpenSim.Framework.Interfaces
32	{	38	{
33	/// <summary>	39	/// <summary>
34	/// ILocalStorage. Really hacked together right now needs cleaning up	40	/// Handles connection to Grid Servers.
35	/// </summary>	41	/// also Sim to Sim connections?
36	public interface ILocalStorage	42	/// </summary>
37	{	43
38	void StorePrim(PrimData prim);	44	public interface IGridServer
39	void RemovePrim(LLUUID primID);	45	{
40	void LoadPrimitives(ILocalStorageReceiver receiver);	46	UUIDBlock RequestUUIDBlock();
41	void ShutDown();	47	NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions
42	}	48	AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
43		49	bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
44	public interface ILocalStorageReceiver	50	string GetName();
45	{	51	bool RequestConnection();
46	void PrimFromStorage(PrimData prim);	52	void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
47	}	53	void Close();
48		54	}
49		55
50	public class PrimData	56	public struct UUIDBlock
51	{	57	{
52	public LLUUID OwnerID;	58	public LLUUID BlockStart;
53	public byte PCode;	59	public LLUUID BlockEnd;
54	public byte PathBegin;	60	}
55	public byte PathEnd;	61
56	public byte PathScaleX;	62	public class AuthenticateResponse
57	public byte PathScaleY;	63	{
58	public byte PathShearX;	64	public bool Authorised;
59	public byte PathShearY;	65	public Login LoginInfo;
60	public sbyte PathSkew;	66
61	public byte ProfileBegin;	67	public AuthenticateResponse()
62	public byte ProfileEnd;	68	{
63	public LLVector3 Scale;	69
64	public byte PathCurve;	70	}
65	public byte ProfileCurve;	71
66	public uint ParentID=0;	72	}
67	public byte ProfileHollow;	73
68	public sbyte PathRadiusOffset;	74	public interface IGridPlugin
69	public byte PathRevolutions;	75	{
70	public sbyte PathTaperX;	76	IGridServer GetGridServer();
71	public sbyte PathTaperY;	77	}
72	public sbyte PathTwist;
73	public sbyte PathTwistBegin;
74
75	//following only used during prim storage
76	public LLVector3 Position;
77	public LLQuaternion Rotation;
78	public uint LocalID;
79	public LLUUID FullID;
80
81	public PrimData()
82	{
83
84	}
85	}
86	}	78	}