merged new OpenSim from branches/ogs-cs

2 files changed, 18 insertions, 1 deletions

diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index a62dcdc..42f45fc 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.*.192")]
+[assembly: AssemblyVersionAttribute("0.1.*.193206")]
 [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
 [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
 [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
index fef4c3e..c2d7172 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.Net.Sockets;

 using System.IO;

 using libsecondlife;

+using OpenSim;

 

 namespace OpenSim.GridServers

 {

@@ -46,6 +47,10 @@ namespace OpenSim.GridServers
         public interface IGridServer

         {

                 bool RequestConnection();

+                Dictionary<uint, agentcircuitdata> agentcircuits {

+                        get;

+                        set;

+                }

                 UUIDBlock RequestUUIDBlock();

                 void RequestNeighbours(); //should return a array of neighbouring regions

                 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

@@ -91,4 +96,16 @@ namespace OpenSim.GridServers
         {

                 IGridServer GetGridServer();

         }

+

+       public class agentcircuitdata {

+                public agentcircuitdata() { }

+                public LLUUID AgentID;

+                public LLUUID SessionID;

+                public LLUUID SecureSessionID;

+                public string firstname;

+                public string lastname;

+                public uint circuitcode;

+        }

+

+

 }