OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load XML for neighbourinfo from grid

adam
gareth 2007-03-20 09:04:49 +00:00
parent 8d989c94d2
commit b83efd4947
14 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.1.*.236 0.1.0.240

2
src/Config/SimConfig/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-simconfig")] [assembly: AssemblyTitleAttribute("opensim-simconfig")]
[assembly: AssemblyDescriptionAttribute("The default configuration handler")] [assembly: AssemblyDescriptionAttribute("The default configuration handler")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/GridInterfaces/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

6
src/GridInterfaces/IGridServer.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.GridServers
public interface IGridServer public interface IGridServer
{ {
UUIDBlock RequestUUIDBlock(); UUIDBlock RequestUUIDBlock();
neighbourinfo[] RequestNeighbours(); //should return a array of neighbouring regions neighbourinfo[] RequestNeighbours(ulong regionhandle); //should return a array of neighbouring regions
AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
string GetName(); string GetName();
@ -63,7 +63,7 @@ namespace OpenSim.GridServers
} }
public abstract UUIDBlock RequestUUIDBlock(); public abstract UUIDBlock RequestUUIDBlock();
public abstract neighbourinfo[] RequestNeighbours(); public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle);
public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract string GetName(); public abstract string GetName();
@ -74,7 +74,7 @@ namespace OpenSim.GridServers
public abstract class LocalGridBase : IGridServer public abstract class LocalGridBase : IGridServer
{ {
public abstract UUIDBlock RequestUUIDBlock(); public abstract UUIDBlock RequestUUIDBlock();
public abstract neighbourinfo[] RequestNeighbours(); public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle);
public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract string GetName(); public abstract string GetName();

2
src/LocalServers/LocalGridServers/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-localservers")] [assembly: AssemblyTitleAttribute("opensim-localservers")]
[assembly: AssemblyDescriptionAttribute("local grid servers")] [assembly: AssemblyDescriptionAttribute("local grid servers")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/LocalServers/LocalGridServers/LocalGrid.cs
View File

@ -160,7 +160,7 @@ namespace LocalGridServers
return(uuidBlock); return(uuidBlock);
} }
public override neighbourinfo[] RequestNeighbours() public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
{ {
return new neighbourinfo[8]; return new neighbourinfo[8];
} }

2
src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-localstorage")] [assembly: AssemblyTitleAttribute("opensim-localstorage")]
[assembly: AssemblyDescriptionAttribute("The local storage handler")] [assembly: AssemblyDescriptionAttribute("The local storage handler")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/OpenSim.Framework/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-remoteservers")] [assembly: AssemblyTitleAttribute("opensim-remoteservers")]
[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] [assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

35
src/RemoteServers/RemoteGridServers/RemoteGrid.cs
View File

@ -25,11 +25,13 @@
* *
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.IO; using System.IO;
using System.Xml;
using libsecondlife; using libsecondlife;
using OpenSim.GridServers; using OpenSim.GridServers;
@ -116,7 +118,7 @@ namespace RemoteGridServers
public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
{ {
WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString()); WebRequest DeleteSession = WebRequest.Create(UserServerUrl + "/usersessions/" + sessionID.ToString());
DeleteSession.Method="DELETE"; DeleteSession.Method="DELETE";
DeleteSession.ContentType="text/plaintext"; DeleteSession.ContentType="text/plaintext";
DeleteSession.ContentLength=0; DeleteSession.ContentLength=0;
@ -137,16 +139,37 @@ namespace RemoteGridServers
return(uuidBlock); return(uuidBlock);
} }
public override neighbourinfo[] RequestNeighbours() public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
{ {
neighbourinfo[] neighbours= new neighbourinfo[8]; ArrayList neighbourlist = new ArrayList();
return neighbours;
WebRequest FindNeighbours = WebRequest.Create(GridServerUrl + "/regions/" + regionhandle.ToString() + "/neighbours");
FindNeighbours.ContentType="text/plaintext";
FindNeighbours.ContentLength=0;
StreamWriter stOut = new StreamWriter (FindNeighbours.GetRequestStream(), System.Text.Encoding.ASCII);
stOut.Write("");
stOut.Close();
XmlDocument GridRespXml = new XmlDocument();
GridRespXml.Load(FindNeighbours.GetResponse().GetResponseStream());
XmlNode NeighboursRoot = GridRespXml.FirstChild;
if(NeighboursRoot.Name != "neighbours") {
return new neighbourinfo[0];
}
FindNeighbours.GetResponse().GetResponseStream().Close();
return new neighbourinfo[0];
} }
public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey) public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerUrl, string GridSendKey, string GridRecvKey)
{ {
this.UserServerUrl = UserServerUrl; this.UserServerUrl = UserServerUrl;
this.UserSendKey = UserSendKey; this.UserSendKey = UserSendKey;
this.UserRecvKey = UserRecvKey; this.UserRecvKey = UserRecvKey;
this.GridServerUrl = GridServerUrl; this.GridServerUrl = GridServerUrl;
this.GridSendKey = GridSendKey; this.GridSendKey = GridSendKey;

2
src/ServerConsole/ServerConsole/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-serverconsole")] [assembly: AssemblyTitleAttribute("opensim-serverconsole")]
[assembly: AssemblyDescriptionAttribute("The default server console")] [assembly: AssemblyDescriptionAttribute("The default server console")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/VersionInfo.cs
View File

@ -32,6 +32,6 @@ namespace OpenSim
/// </summary> /// </summary>
public class VersionInfo public class VersionInfo
{ {
public static string Version = "0.1, Build 1174249095, Revision 236M"; public static string Version = "0.1, Build 1174381410, Revision 240M";
} }
} }

2
src/physics/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-physicsmanager")] [assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
[assembly: AssemblyDescriptionAttribute("Handles physics plugins")] [assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]

2
src/physics/plugins/AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.1.*.236")] [assembly: AssemblyVersionAttribute("0.1.0.240")]
[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] [assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] [assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]