diff options
author | Diva Canto | 2009-09-22 14:46:05 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-22 14:46:05 -0700 |
commit | ffd30b8ac31bc408316079ba86076bf9e984a8be (patch) | |
tree | 47c85aa445f21037576d6ce5e2df8f7477289343 /OpenSim/Services | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.zip opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.gz opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.bz2 opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.xz |
Moved RegionName from RegionInfo to SimpleRegionInfo.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 112 | ||||
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 4 |
2 files changed, 56 insertions, 60 deletions
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index f68c10a..6b0518c 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |||
@@ -54,67 +54,63 @@ namespace OpenSim.Services.Connectors.Grid | |||
54 | m_AssetService = assService; | 54 | m_AssetService = assService; |
55 | } | 55 | } |
56 | 56 | ||
57 | public UUID LinkRegion(SimpleRegionInfo info) | 57 | public UUID LinkRegion(SimpleRegionInfo info, out ulong realHandle) |
58 | { | 58 | { |
59 | UUID uuid = UUID.Zero; | 59 | UUID uuid = UUID.Zero; |
60 | realHandle = 0; | ||
60 | 61 | ||
61 | //Hashtable hash = new Hashtable(); | 62 | Hashtable hash = new Hashtable(); |
62 | //hash["region_name"] = info.RegionName; | 63 | hash["region_name"] = info.RegionName; |
63 | 64 | ||
64 | //IList paramList = new ArrayList(); | 65 | IList paramList = new ArrayList(); |
65 | //paramList.Add(hash); | 66 | paramList.Add(hash); |
66 | 67 | ||
67 | //XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); | 68 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); |
68 | //string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | 69 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; |
69 | //m_log.Debug("[HGrid]: Linking to " + uri); | 70 | m_log.Debug("[HGrid]: Linking to " + uri); |
70 | //XmlRpcResponse response = request.Send(uri, 10000); | 71 | XmlRpcResponse response = request.Send(uri, 10000); |
71 | //if (response.IsFault) | 72 | if (response.IsFault) |
72 | //{ | 73 | { |
73 | // m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); | 74 | m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); |
74 | //} | 75 | } |
75 | //else | 76 | else |
76 | //{ | 77 | { |
77 | // hash = (Hashtable)response.Value; | 78 | hash = (Hashtable)response.Value; |
78 | // //foreach (Object o in hash) | 79 | //foreach (Object o in hash) |
79 | // // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 80 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
80 | // try | 81 | try |
81 | // { | 82 | { |
82 | // UUID.TryParse((string)hash["uuid"], out uuid); | 83 | UUID.TryParse((string)hash["uuid"], out uuid); |
83 | // info.RegionID = uuid; | 84 | info.RegionID = uuid; |
84 | // if ((string)hash["handle"] != null) | 85 | if ((string)hash["handle"] != null) |
85 | // { | 86 | { |
86 | // info.regionSecret = (string)hash["handle"]; | 87 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
87 | // //m_log.Debug(">> HERE: " + info.regionSecret); | 88 | m_log.Debug(">> HERE, realHandle: " + realHandle); |
88 | // } | 89 | } |
89 | // if (hash["region_image"] != null) | 90 | //if (hash["region_image"] != null) |
90 | // { | 91 | //{ |
91 | // UUID img = UUID.Zero; | 92 | // UUID img = UUID.Zero; |
92 | // UUID.TryParse((string)hash["region_image"], out img); | 93 | // UUID.TryParse((string)hash["region_image"], out img); |
93 | // info.RegionSettings.TerrainImageID = img; | 94 | // info.RegionSettings.TerrainImageID = img; |
94 | // } | 95 | //} |
95 | // if (hash["region_name"] != null) | 96 | if (hash["region_name"] != null) |
96 | // { | 97 | { |
97 | // info.RegionName = (string)hash["region_name"]; | 98 | info.RegionName = (string)hash["region_name"]; |
98 | // //m_log.Debug(">> " + info.RegionName); | 99 | //m_log.Debug(">> " + info.RegionName); |
99 | // } | 100 | } |
100 | // if (hash["internal_port"] != null) | 101 | if (hash["internal_port"] != null) |
101 | // { | 102 | { |
102 | // int port = Convert.ToInt32((string)hash["internal_port"]); | 103 | int port = Convert.ToInt32((string)hash["internal_port"]); |
103 | // info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); | 104 | info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); |
104 | // //m_log.Debug(">> " + info.InternalEndPoint.ToString()); | 105 | //m_log.Debug(">> " + info.InternalEndPoint.ToString()); |
105 | // } | 106 | } |
106 | // if (hash["remoting_port"] != null) | 107 | |
107 | // { | 108 | } |
108 | // info.RemotingPort = Convert.ToUInt32(hash["remoting_port"]); | 109 | catch (Exception e) |
109 | // //m_log.Debug(">> " + info.RemotingPort); | 110 | { |
110 | // } | 111 | m_log.Error("[HGrid]: Got exception while parsing hyperlink response " + e.StackTrace); |
111 | 112 | } | |
112 | // } | 113 | } |
113 | // catch (Exception e) | ||
114 | // { | ||
115 | // m_log.Error("[HGrid]: Got exception while parsing hyperlink response " + e.StackTrace); | ||
116 | // } | ||
117 | //} | ||
118 | return uuid; | 114 | return uuid; |
119 | } | 115 | } |
120 | 116 | ||
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index dd529f5..b37a51b 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -179,7 +179,7 @@ namespace OpenSim.Services.GridService | |||
179 | rdata.posY = (int)rinfo.RegionLocY; | 179 | rdata.posY = (int)rinfo.RegionLocY; |
180 | rdata.RegionID = rinfo.RegionID; | 180 | rdata.RegionID = rinfo.RegionID; |
181 | rdata.Data = rinfo.ToKeyValuePairs(); | 181 | rdata.Data = rinfo.ToKeyValuePairs(); |
182 | //rdata.RegionName = rinfo.RegionName; | 182 | rdata.RegionName = rinfo.RegionName; |
183 | 183 | ||
184 | return rdata; | 184 | return rdata; |
185 | } | 185 | } |
@@ -190,7 +190,7 @@ namespace OpenSim.Services.GridService | |||
190 | rinfo.RegionLocX = (uint)rdata.posX; | 190 | rinfo.RegionLocX = (uint)rdata.posX; |
191 | rinfo.RegionLocY = (uint)rdata.posY; | 191 | rinfo.RegionLocY = (uint)rdata.posY; |
192 | rinfo.RegionID = rdata.RegionID; | 192 | rinfo.RegionID = rdata.RegionID; |
193 | //rinfo.RegionName = rdata.RegionName; | 193 | rinfo.RegionName = rdata.RegionName; |
194 | 194 | ||
195 | return rinfo; | 195 | return rinfo; |
196 | } | 196 | } |