diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index dcc4746..1783e0a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) | 266 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, EntityTransferContext ctx, out string reason, out bool logout) |
267 | { | 267 | { |
268 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: CreateAgent {0} {1}", reg.ServerURI, finalDestination.ServerURI); | 268 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: CreateAgent {0} {1}", reg.ServerURI, finalDestination.ServerURI); |
269 | reason = string.Empty; | 269 | reason = string.Empty; |
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
308 | } | 308 | } |
309 | } | 309 | } |
310 | 310 | ||
311 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout); | 311 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout); |
312 | } | 312 | } |
313 | 313 | ||
314 | public void TriggerTeleportHome(UUID id, IClientAPI client) | 314 | public void TriggerTeleportHome(UUID id, IClientAPI client) |
@@ -333,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
333 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: RestrictAppearanceAbroad is ON. Checking generic appearance"); | 333 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: RestrictAppearanceAbroad is ON. Checking generic appearance"); |
334 | 334 | ||
335 | // Check wearables | 335 | // Check wearables |
336 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) | 336 | for (int i = 0; i < sp.Appearance.Wearables.Length ; i++) |
337 | { | 337 | { |
338 | for (int j = 0; j < sp.Appearance.Wearables[i].Count; j++) | 338 | for (int j = 0; j < sp.Appearance.Wearables[i].Count; j++) |
339 | { | 339 | { |
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
342 | 342 | ||
343 | bool found = false; | 343 | bool found = false; |
344 | foreach (AvatarAppearance a in ExportedAppearance) | 344 | foreach (AvatarAppearance a in ExportedAppearance) |
345 | if (a.Wearables[i] != null) | 345 | if (i < a.Wearables.Length && a.Wearables[i] != null) |
346 | { | 346 | { |
347 | found = true; | 347 | found = true; |
348 | break; | 348 | break; |
@@ -356,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
356 | 356 | ||
357 | found = false; | 357 | found = false; |
358 | foreach (AvatarAppearance a in ExportedAppearance) | 358 | foreach (AvatarAppearance a in ExportedAppearance) |
359 | if (sp.Appearance.Wearables[i][j].AssetID == a.Wearables[i][j].AssetID) | 359 | if (i < a.Wearables.Length && sp.Appearance.Wearables[i][j].AssetID == a.Wearables[i][j].AssetID) |
360 | { | 360 | { |
361 | found = true; | 361 | found = true; |
362 | break; | 362 | break; |