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

Added SimUUID 

Added empty POST for /sims in REST on gridserver
0.1-prestable
gareth 2007-04-04 18:57:13 +00:00
parent d3766d0aef
commit f741e00ad8
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenGridServices.GridServer/GridHttp.cs
View File

@ -160,6 +160,8 @@ namespace OpenGridServices.GridServer
respstring+="<estate_id>1</estate_id>"; respstring+="<estate_id>1</estate_id>";
respstring+="</sim>"; respstring+="</sim>";
break; break;
case "POST":
break;
} }
} }
break; break;

18
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -55,6 +55,7 @@ namespace OpenSim
public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
{ {
LLUUID SimUUID;
//private SimConfig Cfg; //private SimConfig Cfg;
private IGenericConfig localConfig; private IGenericConfig localConfig;
//private IGenericConfig remoteConfig; //private IGenericConfig remoteConfig;
@ -110,20 +111,9 @@ namespace OpenSim
Console.WriteLine(e.Message); Console.WriteLine(e.Message);
} }
m_console.WriteLine("Main.cs:Startup() - Loading configuration"); m_console.WriteLine("Main.cs:Startup() - Loading configuration");
string configfromgrid = localConfig.GetAttribute("ConfigFromGrid"); this.regionData.InitConfig(this.m_sandbox, this.localConfig);
if (configfromgrid == "true") SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID"));
{ this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
//config from remote server is not implemented yet
//this.remoteConfig = new RemoteConfig(localConfig.GetAttribute("RemoteConfigURL"), localConfig.GetAttribute("SimUUID"));
//this.remoteConfig.LoadData();
//this.regionData.InitConfig(this.m_sandbox, this.remoteConfig);
//this.remoteConfig.Close();
}
else
{
this.regionData.InitConfig(this.m_sandbox, this.localConfig);
}
this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
GridServers = new Grid(); GridServers = new Grid();
if (m_sandbox) if (m_sandbox)

20
OpenSim.RegionServer/RegionInfo.cs
View File

@ -3,12 +3,14 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using libsecondlife;
namespace OpenSim namespace OpenSim
{ {
public class RegionInfo // could inherit from SimProfileBase public class RegionInfo // could inherit from SimProfileBase
{ {
public string RegionName; public string RegionName;
public LLUUID SimUUID;
public uint RegionLocX; public uint RegionLocX;
public uint RegionLocY; public uint RegionLocY;
@ -40,8 +42,21 @@ namespace OpenSim
this.isSandbox = sandboxMode; this.isSandbox = sandboxMode;
try try
{ {
// Sim UUID
string attri ="";
attri = configData.GetAttribute("SimUUID");
if (attri == "")
{
this.SimUUID = LLUUID.Random();
configData.SetAttribute("SimUUID", this.SimUUID.ToString());
}
else
{
this.SimUUID = new LLUUID(attri);
}
// Sim name // Sim name
string attri =""; attri ="";
attri = configData.GetAttribute("SimName"); attri = configData.GetAttribute("SimName");
if (attri == "") if (attri == "")
{ {
@ -215,7 +230,8 @@ namespace OpenSim
} }
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated());
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString());
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);