diff options
author | Melanie | 2010-01-09 23:25:34 +0000 |
---|---|---|
committer | Melanie | 2010-01-09 23:25:34 +0000 |
commit | 59ecd6d151a990454847358fc4f83fb210913741 (patch) | |
tree | f64408d230f689d91ac616ee58283b002c0c1120 /OpenSim | |
parent | Preliminary work on the new default region setting mechanism (diff) | |
download | opensim-SC_OLD-59ecd6d151a990454847358fc4f83fb210913741.zip opensim-SC_OLD-59ecd6d151a990454847358fc4f83fb210913741.tar.gz opensim-SC_OLD-59ecd6d151a990454847358fc4f83fb210913741.tar.bz2 opensim-SC_OLD-59ecd6d151a990454847358fc4f83fb210913741.tar.xz |
Temp fix: initialize flags value to prevent exception
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 884bc95..31163a5 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -58,6 +58,13 @@ namespace OpenSim.Services.GridService | |||
58 | { | 58 | { |
59 | m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true); | 59 | m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true); |
60 | } | 60 | } |
61 | |||
62 | MainConsole.Instance.Commands.AddCommand("grid", true, | ||
63 | "show region", | ||
64 | "show region <Region name>", | ||
65 | "Show details on a region", | ||
66 | "Display all details about a registered grid region", | ||
67 | HandleShowRegion); | ||
61 | } | 68 | } |
62 | 69 | ||
63 | #region IGridService | 70 | #region IGridService |
@@ -93,6 +100,7 @@ namespace OpenSim.Services.GridService | |||
93 | // Everything is ok, let's register | 100 | // Everything is ok, let's register |
94 | RegionData rdata = RegionInfo2RegionData(regionInfos); | 101 | RegionData rdata = RegionInfo2RegionData(regionInfos); |
95 | rdata.ScopeID = scopeID; | 102 | rdata.ScopeID = scopeID; |
103 | rdata.Data["flags"] = "0"; | ||
96 | 104 | ||
97 | if (region != null) | 105 | if (region != null) |
98 | { | 106 | { |
@@ -287,5 +295,16 @@ namespace OpenSim.Services.GridService | |||
287 | 295 | ||
288 | return Convert.ToInt32(region.Data["flags"]); | 296 | return Convert.ToInt32(region.Data["flags"]); |
289 | } | 297 | } |
298 | |||
299 | private void HandleShowRegion(string module, string[] cmd) | ||
300 | { | ||
301 | if (cmd.Length != 3) | ||
302 | { | ||
303 | MainConsole.Instance.Output("Syntax: show region <region name>"); | ||
304 | return; | ||
305 | } | ||
306 | |||
307 | |||
308 | } | ||
290 | } | 309 | } |
291 | } | 310 | } |