diff options
author | Diva Canto | 2010-01-17 11:33:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-17 11:33:47 -0800 |
commit | f276ba57bf5bd732fbc6a255213c9bb7f5f5f148 (patch) | |
tree | 65c49c571c4012b195a309866b8bf6ed2885f9ef /OpenSim/Services/Connectors | |
parent | Copyright notices. (diff) | |
download | opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.zip opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.gz opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.bz2 opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.xz |
HG agent transfers are starting to work. Gatekeeper handlers are missing.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs index 0bb1c0e..953c7bd 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs | |||
@@ -50,6 +50,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
50 | 50 | ||
51 | private IAssetService m_AssetService; | 51 | private IAssetService m_AssetService; |
52 | 52 | ||
53 | public HypergridServiceConnector() : this(null) { } | ||
54 | |||
53 | public HypergridServiceConnector(IAssetService assService) | 55 | public HypergridServiceConnector(IAssetService assService) |
54 | { | 56 | { |
55 | m_AssetService = assService; | 57 | m_AssetService = assService; |
@@ -197,21 +199,24 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
197 | GridRegion region = new GridRegion(); | 199 | GridRegion region = new GridRegion(); |
198 | 200 | ||
199 | UUID.TryParse((string)hash["uuid"], out region.RegionID); | 201 | UUID.TryParse((string)hash["uuid"], out region.RegionID); |
200 | //m_log.Debug(">> HERE, uuid: " + uuid); | 202 | //m_log.Debug(">> HERE, uuid: " + region.RegionID); |
201 | int n = 0; | 203 | int n = 0; |
202 | if (hash["x"] != null) | 204 | if (hash["x"] != null) |
203 | { | 205 | { |
204 | Int32.TryParse((string)hash["x"], out n); | 206 | Int32.TryParse((string)hash["x"], out n); |
205 | region.RegionLocX = n; | 207 | region.RegionLocX = n; |
208 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); | ||
206 | } | 209 | } |
207 | if (hash["y"] != null) | 210 | if (hash["y"] != null) |
208 | { | 211 | { |
209 | Int32.TryParse((string)hash["y"], out n); | 212 | Int32.TryParse((string)hash["y"], out n); |
210 | region.RegionLocY = n; | 213 | region.RegionLocY = n; |
214 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | ||
211 | } | 215 | } |
212 | if (hash["region_name"] != null) | 216 | if (hash["region_name"] != null) |
213 | { | 217 | { |
214 | region.RegionName = (string)hash["region_name"]; | 218 | region.RegionName = (string)hash["region_name"]; |
219 | //m_log.Debug(">> HERE, name: " + region.RegionName); | ||
215 | } | 220 | } |
216 | if (hash["hostname"] != null) | 221 | if (hash["hostname"] != null) |
217 | region.ExternalHostName = (string)hash["hostname"]; | 222 | region.ExternalHostName = (string)hash["hostname"]; |