brought zircon branch into trunk

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>

-        /// ILocalStorage. Really hacked together right now needs cleaning up

-        /// </summary>

-        public interface ILocalStorage

-        {

-                void StorePrim(PrimData prim);

-                void RemovePrim(LLUUID primID);

-                void LoadPrimitives(ILocalStorageReceiver receiver);

-                void ShutDown();

-        }

-        

-        public interface ILocalStorageReceiver

-        {

-                void PrimFromStorage(PrimData prim);

-        }

-        

-        

-        public class PrimData

-        {

-                public LLUUID OwnerID;

-                public byte PCode;

-                public byte PathBegin;

-                public byte PathEnd;

-                public byte PathScaleX;

-                public byte PathScaleY;

-                public byte PathShearX;

-                public byte PathShearY;

-                public sbyte PathSkew;

-                public byte ProfileBegin;

-                public byte ProfileEnd;

-                public LLVector3 Scale;

-                public byte PathCurve;

-                public byte ProfileCurve;

-                public uint ParentID=0;

-                public byte ProfileHollow;

-                public sbyte PathRadiusOffset;

-        public byte PathRevolutions;

-        public sbyte PathTaperX;

-        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()

-                {

-                        

-                }

-        }

+    /// <summary>

+    /// Handles connection to Grid Servers.

+    /// also Sim to Sim connections?

+    /// </summary>

+

+    public interface IGridServer

+    {

+        UUIDBlock RequestUUIDBlock();

+        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);

+        string GetName();

+        bool RequestConnection();

+        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

+        void Close();

+    }

+    

+    public struct UUIDBlock

+    {

+        public LLUUID BlockStart;

+        public LLUUID BlockEnd;

+    }

+

+    public class AuthenticateResponse

+    {

+        public bool Authorised;

+        public Login LoginInfo;

+

+        public AuthenticateResponse()

+        {

+

+        }

+

+    }

+

+    public interface IGridPlugin

+    {

+        IGridServer GetGridServer();

+    }

 }