diff options
author | Diva Canto | 2009-09-26 11:01:18 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-26 11:01:18 -0700 |
commit | dcfd08b8dd57e667db8e0b5900da4648a020160e (patch) | |
tree | 48bc721a24e861549417b228c526382d36ad98a3 /OpenSim/Region/CoreModules | |
parent | Fixed the order of params to GetRegionRange. (diff) | |
download | opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.zip opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.gz opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.bz2 opensim-SC_OLD-dcfd08b8dd57e667db8e0b5900da4648a020160e.tar.xz |
Fixed a bug with link-region.
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 14 insertions, 28 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 4fbee7f..41f96b3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | |||
@@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
37 | using OpenSim.Server.Base; | 37 | using OpenSim.Server.Base; |
38 | using OpenSim.Server.Handlers.Base; | 38 | using OpenSim.Server.Handlers.Base; |
39 | using OpenSim.Server.Handlers.Grid; | 39 | using OpenSim.Server.Handlers.Grid; |
40 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid |
42 | { | 43 | { |
@@ -106,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
106 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | 107 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); |
107 | } | 108 | } |
108 | 109 | ||
109 | SimpleRegionInfo rinfo = new SimpleRegionInfo(scene.RegionInfo); | 110 | GridRegion rinfo = new GridRegion(scene.RegionInfo); |
110 | m_HypergridHandler.AddRegion(rinfo); | 111 | m_HypergridHandler.AddRegion(rinfo); |
111 | } | 112 | } |
112 | 113 | ||
@@ -115,7 +116,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
115 | if (!m_Enabled) | 116 | if (!m_Enabled) |
116 | return; | 117 | return; |
117 | 118 | ||
118 | SimpleRegionInfo rinfo = new SimpleRegionInfo(scene.RegionInfo); | 119 | GridRegion rinfo = new GridRegion(scene.RegionInfo); |
119 | m_HypergridHandler.RemoveRegion(rinfo); | 120 | m_HypergridHandler.RemoveRegion(rinfo); |
120 | } | 121 | } |
121 | 122 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs index 36915ef..0974372 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
86 | 86 | ||
87 | private void RunHGCommand(string command, string[] cmdparams) | 87 | private void RunHGCommand(string command, string[] cmdparams) |
88 | { | 88 | { |
89 | if (command.Equals("linkk-mapping")) | 89 | if (command.Equals("link-mapping")) |
90 | { | 90 | { |
91 | if (cmdparams.Length == 2) | 91 | if (cmdparams.Length == 2) |
92 | { | 92 | { |
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | } | 106 | } |
107 | else if (command.Equals("linkk-region")) | 107 | else if (command.Equals("link-region")) |
108 | { | 108 | { |
109 | if (cmdparams.Length < 3) | 109 | if (cmdparams.Length < 3) |
110 | { | 110 | { |
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
187 | } | 187 | } |
188 | return; | 188 | return; |
189 | } | 189 | } |
190 | else if (command.Equals("unlinkk-region")) | 190 | else if (command.Equals("unlink-region")) |
191 | { | 191 | { |
192 | if (cmdparams.Length < 1) | 192 | if (cmdparams.Length < 1) |
193 | { | 193 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 66cde91..0bb4206 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -159,27 +159,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
159 | { | 159 | { |
160 | m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); | 160 | m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); |
161 | HGCommands hgCommands = new HGCommands(this, scene); | 161 | HGCommands hgCommands = new HGCommands(this, scene); |
162 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-region", | 162 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-region", |
163 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", | 163 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", |
164 | "Link a hypergrid region", hgCommands.RunCommand); | 164 | "Link a hypergrid region", hgCommands.RunCommand); |
165 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlinkk-region", | 165 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlink-region", |
166 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", | 166 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", |
167 | "Unlink a hypergrid region", hgCommands.RunCommand); | 167 | "Unlink a hypergrid region", hgCommands.RunCommand); |
168 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-mapping", "link-mapping [<x> <y>] <cr>", | 168 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [<x> <y>] <cr>", |
169 | "Set local coordinate to map HG regions to", hgCommands.RunCommand); | 169 | "Set local coordinate to map HG regions to", hgCommands.RunCommand); |
170 | m_Initialized = true; | 170 | m_Initialized = true; |
171 | } | 171 | } |
172 | |||
173 | |||
174 | //scene.AddCommand("HGGridServicesConnector", "linkk-region", | ||
175 | // "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", | ||
176 | // "Link a hypergrid region", hgCommands.RunCommand); | ||
177 | //scene.AddCommand("HGGridServicesConnector", "unlinkk-region", | ||
178 | // "unlink-region <local name> or <HostName>:<HttpPort> <cr>", | ||
179 | // "Unlink a hypergrid region", hgCommands.RunCommand); | ||
180 | //scene.AddCommand("HGGridServicesConnector", "linkk-mapping", "link-mapping [<x> <y>] <cr>", | ||
181 | // "Set local coordinate to map HG regions to", hgCommands.RunCommand); | ||
182 | |||
183 | } | 172 | } |
184 | 173 | ||
185 | #endregion | 174 | #endregion |
@@ -450,15 +439,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
450 | } | 439 | } |
451 | 440 | ||
452 | // Finally, link it | 441 | // Finally, link it |
453 | try | 442 | if (!RegisterRegion(UUID.Zero, regInfo)) |
454 | { | 443 | { |
455 | RegisterRegion(UUID.Zero, regInfo); | 444 | m_log.Warn("[HGrid]: Unable to link region"); |
456 | } | 445 | return false; |
457 | catch (Exception e) | 446 | } |
458 | { | ||
459 | m_log.Warn("[HGrid]: Unable to link region: " + e.Message); | ||
460 | return false; | ||
461 | } | ||
462 | 447 | ||
463 | int x, y; | 448 | int x, y; |
464 | if (!Check4096(m_scene, regInfo, out x, out y)) | 449 | if (!Check4096(m_scene, regInfo, out x, out y)) |