diff options
| author | Melanie | 2012-02-01 09:45:42 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-01 09:45:42 +0000 |
| commit | cc1476fc3614aaa1e63da2c62b0fa21bbd46183e (patch) | |
| tree | 9f36463d4e674c089c6ddee9920130d394abe267 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Fix copy/paste errors (diff) | |
| parent | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri... (diff) | |
| download | opensim-SC-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.zip opensim-SC-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.gz opensim-SC-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.bz2 opensim-SC-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 8d41728..38a7805 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 348 | 348 | ||
| 349 | region.ExternalHostName = uri.Host; | 349 | region.ExternalHostName = uri.Host; |
| 350 | region.HttpPort = (uint)uri.Port; | 350 | region.HttpPort = (uint)uri.Port; |
| 351 | region.ServerURI = uri.ToString(); | 351 | region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString(); |
| 352 | region.RegionName = string.Empty; | 352 | region.RegionName = string.Empty; |
| 353 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); | 353 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); |
| 354 | return region; | 354 | return region; |