aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/GridInterfaces
diff options
context:
space:
mode:
authorgareth2007-03-14 03:34:49 +0000
committergareth2007-03-14 03:34:49 +0000
commit7a54467bed7e1da77f7e1a45ee01dfc709b5608d (patch)
treee0b575e4e87c4b127556597798186b7040d94b2a /src/GridInterfaces
parentMerged ogs-cs into trunk (diff)
downloadopensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.zip
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.gz
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.bz2
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.xz
merged new OpenSim from branches/ogs-cs
Diffstat (limited to 'src/GridInterfaces')
-rw-r--r--src/GridInterfaces/AssemblyInfo.cs2
-rw-r--r--src/GridInterfaces/IGridServer.cs17
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;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] 18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] 19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[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;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.IO; 33using System.IO;
34using libsecondlife; 34using libsecondlife;
35using OpenSim;
35 36
36namespace OpenSim.GridServers 37namespace OpenSim.GridServers
37{ 38{
@@ -46,6 +47,10 @@ namespace OpenSim.GridServers
46 public interface IGridServer 47 public interface IGridServer
47 { 48 {
48 bool RequestConnection(); 49 bool RequestConnection();
50 Dictionary<uint, agentcircuitdata> agentcircuits {
51 get;
52 set;
53 }
49 UUIDBlock RequestUUIDBlock(); 54 UUIDBlock RequestUUIDBlock();
50 void RequestNeighbours(); //should return a array of neighbouring regions 55 void RequestNeighbours(); //should return a array of neighbouring regions
51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 56 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
@@ -91,4 +96,16 @@ namespace OpenSim.GridServers
91 { 96 {
92 IGridServer GetGridServer(); 97 IGridServer GetGridServer();
93 } 98 }
99
100 public class agentcircuitdata {
101 public agentcircuitdata() { }
102 public LLUUID AgentID;
103 public LLUUID SessionID;
104 public LLUUID SecureSessionID;
105 public string firstname;
106 public string lastname;
107 public uint circuitcode;
108 }
109
110
94} 111}