diff options
author | Diva Canto | 2011-12-29 12:17:58 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-29 12:17:58 -0800 |
commit | 70e36ee2b41da03e41b4f61ab348bc85bd872801 (patch) | |
tree | 73cffef414185d1935a9995330b0ae0beae90c0b /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Add Copy task to Prebuild.exe (vsxxxx targets) (diff) | |
download | opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.zip opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.gz opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.bz2 opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.xz |
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index cc9ba97..841363c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -227,8 +227,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
227 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); | 227 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); |
228 | GridRegion homeGatekeeper = MakeRegion(aCircuit); | 228 | GridRegion homeGatekeeper = MakeRegion(aCircuit); |
229 | 229 | ||
230 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}:{5}", | 230 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", |
231 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName); | 231 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); |
232 | 232 | ||
233 | DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq); | 233 | DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq); |
234 | } | 234 | } |
@@ -347,6 +347,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
347 | 347 | ||
348 | region.ExternalHostName = uri.Host; | 348 | region.ExternalHostName = uri.Host; |
349 | region.HttpPort = (uint)uri.Port; | 349 | region.HttpPort = (uint)uri.Port; |
350 | region.ServerURI = uri.ToString(); | ||
350 | region.RegionName = string.Empty; | 351 | region.RegionName = string.Empty; |
351 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); | 352 | region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0); |
352 | return region; | 353 | return region; |