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

Finally the region service config stuff is in.

slimupdates
Melanie 2010-01-10 01:46:34 +00:00
parent 2639fa6ded
commit d889d4e1fa
1 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
OpenSim/Services/GridService/GridService.cs
View File

@ -48,33 +48,45 @@ namespace OpenSim.Services.GridService
private bool m_DeleteOnUnregister = true; private bool m_DeleteOnUnregister = true;
private static GridService m_RootInstance = null; private static GridService m_RootInstance = null;
protected IConfigSource m_config;
public GridService(IConfigSource config) public GridService(IConfigSource config)
: base(config) : base(config)
{ {
m_log.DebugFormat("[GRID SERVICE]: Starting..."); m_log.DebugFormat("[GRID SERVICE]: Starting...");
if (m_RootInstance == null) m_config = config;
m_RootInstance = this;
IConfig gridConfig = config.Configs["GridService"]; IConfig gridConfig = config.Configs["GridService"];
if (gridConfig != null) if (gridConfig != null)
{ {
m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true); m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true);
} }
if (m_RootInstance == null)
{
m_RootInstance = this;
MainConsole.Instance.Commands.AddCommand("grid", true, MainConsole.Instance.Commands.AddCommand("grid", true,
"show region", "show region",
"show region <Region name>", "show region <Region name>",
"Show details on a region", "Show details on a region",
"Display all details about a registered grid region", String.Empty,
HandleShowRegion); HandleShowRegion);
MainConsole.Instance.Commands.AddCommand("grid", true,
"set region flags",
"set region flags <Region name> <flags>",
"Set database flags for region",
String.Empty,
HandleSetFlags);
}
} }
#region IGridService #region IGridService
public bool RegisterRegion(UUID scopeID, GridRegion regionInfos) public bool RegisterRegion(UUID scopeID, GridRegion regionInfos)
{ {
IConfig gridConfig = m_config.Configs["GridService"];
// This needs better sanity testing. What if regionInfo is registering in // This needs better sanity testing. What if regionInfo is registering in
// overlapping coords? // overlapping coords?
RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
@ -104,12 +116,23 @@ namespace OpenSim.Services.GridService
// Everything is ok, let's register // Everything is ok, let's register
RegionData rdata = RegionInfo2RegionData(regionInfos); RegionData rdata = RegionInfo2RegionData(regionInfos);
rdata.ScopeID = scopeID; rdata.ScopeID = scopeID;
rdata.Data["flags"] = "0";
if (region != null) if (region != null)
{ {
rdata.Data["flags"] = region.Data["flags"]; // Preserve fields rdata.Data["flags"] = region.Data["flags"]; // Preserve fields
} }
else
{
rdata.Data["flags"] = "0";
if (gridConfig != null)
{
int newFlags = 0;
newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionName, String.Empty));
newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty));
rdata.Data["flags"] = newFlags.ToString();
}
}
int flags = Convert.ToInt32(rdata.Data["flags"]); int flags = Convert.ToInt32(rdata.Data["flags"]);
flags |= (int)OpenSim.Data.RegionFlags.RegionOnline; flags |= (int)OpenSim.Data.RegionFlags.RegionOnline;
rdata.Data["flags"] = flags.ToString(); rdata.Data["flags"] = flags.ToString();
@ -302,9 +325,6 @@ namespace OpenSim.Services.GridService
private void HandleShowRegion(string module, string[] cmd) private void HandleShowRegion(string module, string[] cmd)
{ {
if (m_RootInstance != this)
return;
if (cmd.Length != 3) if (cmd.Length != 3)
{ {
MainConsole.Instance.Output("Syntax: show region <region name>"); MainConsole.Instance.Output("Syntax: show region <region name>");
@ -362,6 +382,7 @@ namespace OpenSim.Services.GridService
} }
catch (Exception e) catch (Exception e)
{ {
MainConsole.Instance.Output("Error in flag specification: " + p);
} }
} }
@ -370,16 +391,29 @@ namespace OpenSim.Services.GridService
private void HandleSetFlags(string module, string[] cmd) private void HandleSetFlags(string module, string[] cmd)
{ {
if (m_RootInstance != this) if (cmd.Length < 5)
return;
if (cmd.Length < 4)
{ {
MainConsole.Instance.Output("Syntax: set region flags <region name> <flags>"); MainConsole.Instance.Output("Syntax: set region flags <region name> <flags>");
return; return;
} }
MainConsole.Instance.Output(ParseFlags(0, cmd[3]).ToString()); List<RegionData> regions = m_Database.Get(cmd[3], UUID.Zero);
if (regions == null || regions.Count < 1)
{
MainConsole.Instance.Output("Region not found");
return;
}
foreach (RegionData r in regions)
{
int flags = Convert.ToInt32(r.Data["flags"]);
flags = ParseFlags(flags, cmd[4]);
r.Data["flags"] = flags.ToString();
OpenSim.Data.RegionFlags f = (OpenSim.Data.RegionFlags)flags;
MainConsole.Instance.Output(String.Format("Set region {0} to {1}", r.RegionName, f));
m_Database.Store(r);
}
} }
} }
} }