diff options
author | Diva Canto | 2010-01-29 09:12:22 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-29 09:12:22 -0800 |
commit | 0c81966c0a8f69474fb542d7b4df1780ef756519 (patch) | |
tree | 549973fd8c11ee8dd3eba939eb0605a28c6d2849 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | Fixed broken dll name. (diff) | |
download | opensim-SC_OLD-0c81966c0a8f69474fb542d7b4df1780ef756519.zip opensim-SC_OLD-0c81966c0a8f69474fb542d7b4df1780ef756519.tar.gz opensim-SC_OLD-0c81966c0a8f69474fb542d7b4df1780ef756519.tar.bz2 opensim-SC_OLD-0c81966c0a8f69474fb542d7b4df1780ef756519.tar.xz |
Works for grid login.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 44f1191..ee6cb04 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
97 | scene.EventManager.OnNewClient += OnNewClient; | 97 | scene.EventManager.OnNewClient += OnNewClient; |
98 | } | 98 | } |
99 | 99 | ||
100 | protected void OnNewClient(IClientAPI client) | 100 | protected virtual void OnNewClient(IClientAPI client) |
101 | { | 101 | { |
102 | client.OnTeleportHomeRequest += TeleportHome; | 102 | client.OnTeleportHomeRequest += TeleportHome; |
103 | } | 103 | } |
@@ -268,6 +268,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
268 | if (sp.ParentID != (uint)0) | 268 | if (sp.ParentID != (uint)0) |
269 | sp.StandUp(); | 269 | sp.StandUp(); |
270 | 270 | ||
271 | m_log.Debug("XXX HERE 1"); | ||
271 | if (!sp.ValidateAttachments()) | 272 | if (!sp.ValidateAttachments()) |
272 | { | 273 | { |
273 | sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); | 274 | sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); |
@@ -978,12 +979,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
978 | if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle) | 979 | if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle) |
979 | { | 980 | { |
980 | 981 | ||
982 | AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | ||
981 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); | 983 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); |
982 | agent.BaseFolder = UUID.Zero; | 984 | agent.BaseFolder = UUID.Zero; |
983 | agent.InventoryFolder = UUID.Zero; | 985 | agent.InventoryFolder = UUID.Zero; |
984 | agent.startpos = new Vector3(128, 128, 70); | 986 | agent.startpos = new Vector3(128, 128, 70); |
985 | agent.child = true; | 987 | agent.child = true; |
986 | agent.Appearance = sp.Appearance; | 988 | agent.Appearance = sp.Appearance; |
989 | if (currentAgentCircuit != null) | ||
990 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | ||
987 | 991 | ||
988 | if (newRegions.Contains(neighbour.RegionHandle)) | 992 | if (newRegions.Contains(neighbour.RegionHandle)) |
989 | { | 993 | { |