diff options
author | diva | 2009-03-18 16:37:26 +0000 |
---|---|---|
committer | diva | 2009-03-18 16:37:26 +0000 |
commit | a7d610ffcca8d707c7f9e9fdd7ad1477981ec2a9 (patch) | |
tree | 4f8a0c98e680fba6af670650993ecebdad4c8de2 /OpenSim/Region/Application | |
parent | Add an event to process undelivered IMs (diff) | |
download | opensim-SC_OLD-a7d610ffcca8d707c7f9e9fdd7ad1477981ec2a9.zip opensim-SC_OLD-a7d610ffcca8d707c7f9e9fdd7ad1477981ec2a9.tar.gz opensim-SC_OLD-a7d610ffcca8d707c7f9e9fdd7ad1477981ec2a9.tar.bz2 opensim-SC_OLD-a7d610ffcca8d707c7f9e9fdd7ad1477981ec2a9.tar.xz |
Adds support for unlink-region command in hypergrid.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 6e7f1c5..f4f3062 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
@@ -69,6 +69,9 @@ namespace OpenSim | |||
69 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 69 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
70 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", | 70 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", |
71 | "Link a hypergrid region", RunCommand); | 71 | "Link a hypergrid region", RunCommand); |
72 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", | ||
73 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", | ||
74 | "Unlink a hypergrid region", RunCommand); | ||
72 | } | 75 | } |
73 | 76 | ||
74 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 77 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
@@ -188,6 +191,18 @@ namespace OpenSim | |||
188 | } | 191 | } |
189 | return; | 192 | return; |
190 | } | 193 | } |
194 | else if (command.Equals("unlink-region")) | ||
195 | { | ||
196 | if (cmdparams.Count < 1) | ||
197 | { | ||
198 | UnlinkRegionCmdUsage(); | ||
199 | return; | ||
200 | } | ||
201 | if (HGHyperlink.TryUnlinkRegion(m_sceneManager.CurrentOrFirstScene, cmdparams[0])) | ||
202 | m_log.InfoFormat("[HGrid]: Successfully unlinked {0}", cmdparams[0]); | ||
203 | else | ||
204 | m_log.InfoFormat("[HGrid]: Unable to unlink {0}, region not found", cmdparams[0]); | ||
205 | } | ||
191 | } | 206 | } |
192 | 207 | ||
193 | private void LoadXmlLinkFile(List<string> cmdparams) | 208 | private void LoadXmlLinkFile(List<string> cmdparams) |
@@ -279,5 +294,12 @@ namespace OpenSim | |||
279 | m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]"); | 294 | m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]"); |
280 | m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]"); | 295 | m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]"); |
281 | } | 296 | } |
297 | |||
298 | private void UnlinkRegionCmdUsage() | ||
299 | { | ||
300 | m_log.Info("Usage: unlink-region <HostName>:<HttpPort>"); | ||
301 | m_log.Info("Usage: unlink-region <LocalName>"); | ||
302 | } | ||
303 | |||
282 | } | 304 | } |
283 | } \ No newline at end of file | 305 | } \ No newline at end of file |