diff options
| author | Melanie | 2012-02-01 10:08:45 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-01 10:08:45 +0000 |
| commit | 16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe (patch) | |
| tree | 1ffd8f2989976713ea79bbc1017a58a8925f1793 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Small optimization to last commit (diff) | |
| download | opensim-SC-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.zip opensim-SC-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.gz opensim-SC-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.bz2 opensim-SC-16aa00e944f73a0a8fd2bd4ae9577f5dfb210bbe.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
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 b16d0d3..5c7ca22 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 353 | 353 | ||
| 354 | region.ExternalHostName = uri.Host; | 354 | region.ExternalHostName = uri.Host; |
| 355 | region.HttpPort = (uint)uri.Port; | 355 | region.HttpPort = (uint)uri.Port; |
| 356 | region.ServerURI = uri.ToString(); | 356 | region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString(); |
| 357 | region.RegionName = string.Empty; | 357 | region.RegionName = string.Empty; |
| 358 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); | 358 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); |
| 359 | return region; | 359 | return region; |