diff options
author | Diva Canto | 2010-12-05 19:43:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-05 19:43:24 -0800 |
commit | 72748746d53df1c033207452a4315d93bc780158 (patch) | |
tree | e50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Services/GridService | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
download | opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.zip opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.gz opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.bz2 opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.xz |
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index eed3207..d5d0195 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -127,16 +127,18 @@ namespace OpenSim.Services.GridService | |||
127 | 127 | ||
128 | if (MainConsole.Instance != null) | 128 | if (MainConsole.Instance != null) |
129 | { | 129 | { |
130 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", "link-region <Xloc> <Yloc> <ServerURI> [<RemoteRegionName>]", "Link a HyperGrid Region", RunCommand); | 130 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
131 | "link-region <Xloc> <Yloc> <ServerURI> [<RemoteRegionName>]", | ||
132 | "Link a HyperGrid Region", RunCommand); | ||
131 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 133 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
132 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RemoteRegionName>]", | 134 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RemoteRegionName>]", |
133 | "Link a hypergrid region (deprecated)", RunCommand); | 135 | "Link a hypergrid region (deprecated)", RunCommand); |
134 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", | 136 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", |
135 | "unlink-region <local name>", | 137 | "unlink-region <local name>", |
136 | "Unlink a hypergrid region", RunCommand); | 138 | "Unlink a hypergrid region", RunCommand); |
137 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>", | 139 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>]", |
138 | "Set local coordinate to map HG regions to", RunCommand); | 140 | "Set local coordinate to map HG regions to", RunCommand); |
139 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>", | 141 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks", |
140 | "List the HG regions", HandleShow); | 142 | "List the HG regions", HandleShow); |
141 | } | 143 | } |
142 | } | 144 | } |
@@ -281,7 +283,7 @@ namespace OpenSim.Services.GridService | |||
281 | else | 283 | else |
282 | regInfo.RegionName = externalName; | 284 | regInfo.RegionName = externalName; |
283 | 285 | ||
284 | m_log.Debug("naming linked region " + regInfo.RegionName); | 286 | m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); |
285 | 287 | ||
286 | // Try get the map image | 288 | // Try get the map image |
287 | //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL); | 289 | //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL); |