aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs28
1 files changed, 19 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 7aeb761..c6ade15 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -156,18 +156,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
156 if (!m_Initialized) 156 if (!m_Initialized)
157 { 157 {
158 m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); 158 m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService);
159 HGCommands hgCommands = new HGCommands(this, scene);
160 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-region",
161 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
162 "Link a hypergrid region", hgCommands.RunCommand);
163 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlinkk-region",
164 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
165 "Unlink a hypergrid region", hgCommands.RunCommand);
166 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-mapping", "link-mapping [<x> <y>] <cr>",
167 "Set local coordinate to map HG regions to", hgCommands.RunCommand);
159 m_Initialized = true; 168 m_Initialized = true;
160 } 169 }
161 170
162 HGCommands hgCommands = new HGCommands(this, scene); 171
163 scene.AddCommand("HG", "link-region", 172 //scene.AddCommand("HGGridServicesConnector", "linkk-region",
164 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", 173 // "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
165 "Link a hypergrid region", hgCommands.RunCommand); 174 // "Link a hypergrid region", hgCommands.RunCommand);
166 scene.AddCommand("HG", "unlink-region", 175 //scene.AddCommand("HGGridServicesConnector", "unlinkk-region",
167 "unlink-region <local name> or <HostName>:<HttpPort> <cr>", 176 // "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
168 "Unlink a hypergrid region", hgCommands.RunCommand); 177 // "Unlink a hypergrid region", hgCommands.RunCommand);
169 scene.AddCommand("HG", "link-mapping", "link-mapping [<x> <y>] <cr>", 178 //scene.AddCommand("HGGridServicesConnector", "linkk-mapping", "link-mapping [<x> <y>] <cr>",
170 "Set local coordinate to map HG regions to", hgCommands.RunCommand); 179 // "Set local coordinate to map HG regions to", hgCommands.RunCommand);
171 180
172 } 181 }
173 182
@@ -407,6 +416,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
407 return null; 416 return null;
408 } 417 }
409 418
419 // From the map search and secondlife://blah
410 public SimpleRegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName) 420 public SimpleRegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
411 { 421 {
412 uint xloc = (uint)(random.Next(0, Int16.MaxValue)); 422 uint xloc = (uint)(random.Next(0, Int16.MaxValue));