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

Added some sanity

adam
gareth 2007-03-18 20:18:52 +00:00
parent 8e28076758
commit 99c56acf74
17 changed files with 229 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

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

7
src/Config.cs
View File

@ -59,7 +59,12 @@ namespace OpenSim
public string GridURL; public string GridURL;
public string GridSendKey; public string GridSendKey;
public string GridRecvKey;
public string UserURL;
public string UserSendKey;
public string UserRecvKey;
public abstract void InitConfig(); public abstract void InitConfig();
public abstract void LoadFromGrid(); public abstract void LoadFromGrid();
public abstract World LoadWorld(); public abstract World LoadWorld();

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

6
src/Config/SimConfig/Db4SimConfig.cs
View File

@ -59,7 +59,11 @@ namespace Db40SimConfig
this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: "); this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: ");
this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: "); this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: ");
this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: "); this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: ");
this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server key: "); this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
this.UserURL=ServerConsole.MainConsole.Instance.CmdPrompt("User server URL: ");
this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
} }
this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
} }

42
src/GridInterfaces/AssemblyInfo.cs
View File

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

12
src/GridInterfaces/IGridServer.cs
View File

@ -47,12 +47,12 @@ namespace OpenSim.GridServers
public interface IGridServer public interface IGridServer
{ {
UUIDBlock RequestUUIDBlock(); UUIDBlock RequestUUIDBlock();
void RequestNeighbours(); //should return a array of neighbouring regions neighbourinfo[] RequestNeighbours(); //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();
bool RequestConnection(); bool RequestConnection();
void SetServerInfo(string ServerUrl, string ServerKey); void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
} }
public abstract class RemoteGridBase : IGridServer public abstract class RemoteGridBase : IGridServer
@ -63,23 +63,23 @@ namespace OpenSim.GridServers
} }
public abstract UUIDBlock RequestUUIDBlock(); public abstract UUIDBlock RequestUUIDBlock();
public abstract void RequestNeighbours(); public abstract neighbourinfo[] RequestNeighbours();
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();
public abstract bool RequestConnection(); public abstract bool RequestConnection();
public abstract void SetServerInfo(string ServerUrl, string ServerKey); public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
} }
public abstract class LocalGridBase : IGridServer public abstract class LocalGridBase : IGridServer
{ {
public abstract UUIDBlock RequestUUIDBlock(); public abstract UUIDBlock RequestUUIDBlock();
public abstract void RequestNeighbours(); public abstract neighbourinfo[] RequestNeighbours();
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();
public abstract bool RequestConnection(); public abstract bool RequestConnection();
public abstract void SetServerInfo(string ServerUrl, string ServerKey); public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
public abstract void AddNewSession(Login session); public abstract void AddNewSession(Login session);
} }

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

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

@ -96,7 +96,7 @@ namespace LocalGridServers
} }
public void SetServerInfo(string ServerUrl, string ServerKey) public void SetServerInfo(string ServerUrl, string SendKey)
{ {
} }
@ -105,7 +105,7 @@ namespace LocalGridServers
{ {
while(true) while(true)
{ {
Thread.Sleep(1000);
} }
} }
} }
@ -160,12 +160,12 @@ namespace LocalGridServers
return(uuidBlock); return(uuidBlock);
} }
public override void RequestNeighbours() public override neighbourinfo[] RequestNeighbours()
{ {
return; return new neighbourinfo[8];
} }
public override void SetServerInfo(string ServerUrl, string ServerKey) public override void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey)
{ {
} }

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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/Main.cs
View File

@ -161,7 +161,7 @@ namespace OpenSim
local_world.PhysScene.SetTerrain(local_world.LandMap); local_world.PhysScene.SetTerrain(local_world.LandMap);
OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey, OpenSim_Main.cfg.GridRecvKey, OpenSim_Main.cfg.UserURL, OpenSim_Main.cfg.UserSendKey, OpenSim_Main.cfg.UserRecvKey);
local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded.
local_world.LoadPrimsFromStorage(); local_world.LoadPrimsFromStorage();

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

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

@ -69,6 +69,11 @@ namespace RemoteGridServers
{ {
private string GridServerUrl; private string GridServerUrl;
private string GridSendKey; private string GridSendKey;
private string GridRecvKey;
private string UserServerUrl;
private string UserSendKey;
private string UserRecvKey;
private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>(); private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
public override Dictionary<uint, agentcircuitdata> agentcircuits { public override Dictionary<uint, agentcircuitdata> agentcircuits {
@ -132,15 +137,20 @@ namespace RemoteGridServers
return(uuidBlock); return(uuidBlock);
} }
public override void RequestNeighbours() public override neighbourinfo[] RequestNeighbours()
{ {
return; neighbourinfo[] neighbours= new neighbourinfo[8];
return neighbours;
} }
public override void SetServerInfo(string ServerUrl, string ServerKey) public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey)
{ {
this.GridServerUrl = ServerUrl; this.UserServerUrl = UserServerUrl;
this.GridSendKey = ServerKey; this.UserSendKey = UserSendKey;
this.UserRecvKey = UserRecvKey;
this.GridServerUrl = GridServerUrl;
this.GridSendKey = GridSendKey;
this.GridRecvKey = GridRecvKey;
} }
public override string GetName() public override string GetName()

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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 1173843165, Revision 193:206M"; public static string Version = "0.1, Build 1174249095, Revision 236M";
} }
} }

42
src/physics/AssemblyInfo.cs
View File

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]

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

@ -1,21 +1,21 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// <auto-generated> // <autogenerated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.42 // Mono Runtime Version: 2.0.50727.42
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </autogenerated>
//------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: CLSCompliantAttribute(false)] [assembly: CLSCompliantAttribute(false)]
[assembly: AssemblyVersionAttribute("0.0.0.1")] [assembly: AssemblyVersionAttribute("0.1.*.236")]
[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")]