aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorgareth2007-03-20 09:04:49 +0000
committergareth2007-03-20 09:04:49 +0000
commitb83efd49475782d7ce65136e7e72f418299cdca6 (patch)
tree435aa2e3bce972680c1473fc7f5d9bc26481b671 /src
parentRemoved the AssemblyInfo.cs files from the Vs2005 projects (diff)
downloadopensim-SC_OLD-b83efd49475782d7ce65136e7e72f418299cdca6.zip
opensim-SC_OLD-b83efd49475782d7ce65136e7e72f418299cdca6.tar.gz
opensim-SC_OLD-b83efd49475782d7ce65136e7e72f418299cdca6.tar.bz2
opensim-SC_OLD-b83efd49475782d7ce65136e7e72f418299cdca6.tar.xz
Load XML for neighbourinfo from grid
Diffstat (limited to '')
-rw-r--r--src/Config/SimConfig/AssemblyInfo.cs2
-rw-r--r--src/GridInterfaces/AssemblyInfo.cs2
-rw-r--r--src/GridInterfaces/IGridServer.cs6
-rw-r--r--src/LocalServers/LocalGridServers/AssemblyInfo.cs2
-rw-r--r--src/LocalServers/LocalGridServers/LocalGrid.cs2
-rw-r--r--src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs2
-rw-r--r--src/OpenSim.Framework/AssemblyInfo.cs2
-rw-r--r--src/RemoteServers/RemoteGridServers/AssemblyInfo.cs2
-rw-r--r--src/RemoteServers/RemoteGridServers/RemoteGrid.cs35
-rw-r--r--src/ServerConsole/ServerConsole/AssemblyInfo.cs2
-rw-r--r--src/VersionInfo.cs2
-rw-r--r--src/physics/AssemblyInfo.cs2
-rw-r--r--src/physics/plugins/AssemblyInfo.cs2
13 files changed, 43 insertions, 20 deletions
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index c97d673..7fabd63 100644
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ b/src/Config/SimConfig/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-simconfig")] 18[assembly: AssemblyTitleAttribute("opensim-simconfig")]
19[assembly: AssemblyDescriptionAttribute("The default configuration handler")] 19[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 186934a..32f1380 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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
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 8ab0971..dcb8ef2 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -47,7 +47,7 @@ namespace OpenSim.GridServers
47 public interface IGridServer 47 public interface IGridServer
48 { 48 {
49 UUIDBlock RequestUUIDBlock(); 49 UUIDBlock RequestUUIDBlock();
50 neighbourinfo[] RequestNeighbours(); //should return a array of neighbouring regions 50 neighbourinfo[] RequestNeighbours(ulong regionhandle); //should return a array of neighbouring regions
51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
52 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 52 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
53 string GetName(); 53 string GetName();
@@ -63,7 +63,7 @@ namespace OpenSim.GridServers
63 } 63 }
64 64
65 public abstract UUIDBlock RequestUUIDBlock(); 65 public abstract UUIDBlock RequestUUIDBlock();
66 public abstract neighbourinfo[] RequestNeighbours(); 66 public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle);
67 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 67 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
68 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 68 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
69 public abstract string GetName(); 69 public abstract string GetName();
@@ -74,7 +74,7 @@ namespace OpenSim.GridServers
74 public abstract class LocalGridBase : IGridServer 74 public abstract class LocalGridBase : IGridServer
75 { 75 {
76 public abstract UUIDBlock RequestUUIDBlock(); 76 public abstract UUIDBlock RequestUUIDBlock();
77 public abstract neighbourinfo[] RequestNeighbours(); 77 public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle);
78 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 78 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
79 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 79 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
80 public abstract string GetName(); 80 public abstract string GetName();
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index 6dbf063..4b17ba2 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-localservers")] 18[assembly: AssemblyTitleAttribute("opensim-localservers")]
19[assembly: AssemblyDescriptionAttribute("local grid servers")] 19[assembly: AssemblyDescriptionAttribute("local grid servers")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
index abea888..bd377d3 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/src/LocalServers/LocalGridServers/LocalGrid.cs
@@ -160,7 +160,7 @@ namespace LocalGridServers
160 return(uuidBlock); 160 return(uuidBlock);
161 } 161 }
162 162
163 public override neighbourinfo[] RequestNeighbours() 163 public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
164 { 164 {
165 return new neighbourinfo[8]; 165 return new neighbourinfo[8];
166 } 166 }
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
index b6afd99..0c5ff75 100644
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ b/src/LocalStorage/Db4LocalStorage/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-localstorage")] 18[assembly: AssemblyTitleAttribute("opensim-localstorage")]
19[assembly: AssemblyDescriptionAttribute("The local storage handler")] 19[assembly: AssemblyDescriptionAttribute("The local storage handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/OpenSim.Framework/AssemblyInfo.cs b/src/OpenSim.Framework/AssemblyInfo.cs
index 186934a..32f1380 100644
--- a/src/OpenSim.Framework/AssemblyInfo.cs
+++ b/src/OpenSim.Framework/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
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/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index b662c4e..7d3f314 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-remoteservers")] 18[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] 19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 4f5d3a9..adb3d0f 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -25,11 +25,13 @@
25* 25*
26*/ 26*/
27using System; 27using System;
28using System.Collections;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Threading; 30using System.Threading;
30using System.Net; 31using System.Net;
31using System.Net.Sockets; 32using System.Net.Sockets;
32using System.IO; 33using System.IO;
34using System.Xml;
33using libsecondlife; 35using libsecondlife;
34using OpenSim.GridServers; 36using OpenSim.GridServers;
35 37
@@ -116,7 +118,7 @@ namespace RemoteGridServers
116 118
117 public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) 119 public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
118 { 120 {
119 WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString()); 121 WebRequest DeleteSession = WebRequest.Create(UserServerUrl + "/usersessions/" + sessionID.ToString());
120 DeleteSession.Method="DELETE"; 122 DeleteSession.Method="DELETE";
121 DeleteSession.ContentType="text/plaintext"; 123 DeleteSession.ContentType="text/plaintext";
122 DeleteSession.ContentLength=0; 124 DeleteSession.ContentLength=0;
@@ -137,16 +139,37 @@ namespace RemoteGridServers
137 return(uuidBlock); 139 return(uuidBlock);
138 } 140 }
139 141
140 public override neighbourinfo[] RequestNeighbours() 142 public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
141 { 143 {
142 neighbourinfo[] neighbours= new neighbourinfo[8]; 144 ArrayList neighbourlist = new ArrayList();
143 return neighbours; 145
146 WebRequest FindNeighbours = WebRequest.Create(GridServerUrl + "/regions/" + regionhandle.ToString() + "/neighbours");
147 FindNeighbours.ContentType="text/plaintext";
148 FindNeighbours.ContentLength=0;
149
150 StreamWriter stOut = new StreamWriter (FindNeighbours.GetRequestStream(), System.Text.Encoding.ASCII);
151 stOut.Write("");
152 stOut.Close();
153
154
155 XmlDocument GridRespXml = new XmlDocument();
156 GridRespXml.Load(FindNeighbours.GetResponse().GetResponseStream());
157
158
159 XmlNode NeighboursRoot = GridRespXml.FirstChild;
160 if(NeighboursRoot.Name != "neighbours") {
161 return new neighbourinfo[0];
162 }
163
164 FindNeighbours.GetResponse().GetResponseStream().Close();
165
166 return new neighbourinfo[0];
144 } 167 }
145 168
146 public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey) 169 public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerUrl, string GridSendKey, string GridRecvKey)
147 { 170 {
148 this.UserServerUrl = UserServerUrl; 171 this.UserServerUrl = UserServerUrl;
149 this.UserSendKey = UserSendKey; 172 this.UserSendKey = UserSendKey;
150 this.UserRecvKey = UserRecvKey; 173 this.UserRecvKey = UserRecvKey;
151 this.GridServerUrl = GridServerUrl; 174 this.GridServerUrl = GridServerUrl;
152 this.GridSendKey = GridSendKey; 175 this.GridSendKey = GridSendKey;
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index f1c084b..e6b64d6 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-serverconsole")] 18[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
19[assembly: AssemblyDescriptionAttribute("The default server console")] 19[assembly: AssemblyDescriptionAttribute("The default server console")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index 5fc0fb0..5cfd136 100644
--- a/src/VersionInfo.cs
+++ b/src/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
32 /// </summary> 32 /// </summary>
33 public class VersionInfo 33 public class VersionInfo
34 { 34 {
35 public static string Version = "0.1, Build 1174249095, Revision 236M"; 35 public static string Version = "0.1, Build 1174381410, Revision 240M";
36 } 36 }
37} 37}
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index 7489b7a..c6a4efa 100644
--- a/src/physics/AssemblyInfo.cs
+++ b/src/physics/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")] 19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index d37a5da..4cd5558 100644
--- a/src/physics/plugins/AssemblyInfo.cs
+++ b/src/physics/plugins/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.*.236")] 17[assembly: AssemblyVersionAttribute("0.1.0.240")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] 19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]