diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
| commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
| tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Services/Connectors/Neighbour | |
| parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
| download | opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz | |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Services/Connectors/Neighbour')
| -rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 9c57a40..0a982f8 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
| @@ -87,7 +87,7 @@ namespace OpenSim.Services.Connectors | |||
| 87 | 87 | ||
| 88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) | 88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) |
| 89 | { | 89 | { |
| 90 | string uri = region.ServerURI + "/region/" + thisRegion.RegionID + "/"; | 90 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; |
| 91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); | 91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); |
| 92 | 92 | ||
| 93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); | 93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); |