diff options
author | UbitUmarov | 2017-06-09 23:27:33 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-09 23:27:33 +0100 |
commit | be975d1e89cbcb62f89cb7cb8367678a80cc47c6 (patch) | |
tree | 3edacaa93423d91af424c183097c56b09c8ab70a /OpenSim/Region/CoreModules | |
parent | only silent remove threads from watch list if they stopped ( ie still conside... (diff) | |
download | opensim-SC_OLD-be975d1e89cbcb62f89cb7cb8367678a80cc47c6.zip opensim-SC_OLD-be975d1e89cbcb62f89cb7cb8367678a80cc47c6.tar.gz opensim-SC_OLD-be975d1e89cbcb62f89cb7cb8367678a80cc47c6.tar.bz2 opensim-SC_OLD-be975d1e89cbcb62f89cb7cb8367678a80cc47c6.tar.xz |
add a adicional in transit flag to signal HG tps, and use it to ignore usernames requests sent to start region during tp; don't send unknows display names ( getdisplaynames cap )
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 99bebdd..c93c54d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -771,8 +771,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
771 | else if (sp.Flying) | 771 | else if (sp.Flying) |
772 | teleportFlags |= (uint)TeleportFlags.IsFlying; | 772 | teleportFlags |= (uint)TeleportFlags.IsFlying; |
773 | 773 | ||
774 | sp.IsInLocalTransit = finalDestination.RegionLocY != 0; // HG | ||
774 | sp.IsInTransit = true; | 775 | sp.IsInTransit = true; |
775 | 776 | ||
777 | |||
776 | if (DisableInterRegionTeleportCancellation) | 778 | if (DisableInterRegionTeleportCancellation) |
777 | teleportFlags |= (uint)TeleportFlags.DisableCancel; | 779 | teleportFlags |= (uint)TeleportFlags.DisableCancel; |
778 | 780 | ||
@@ -1524,6 +1526,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1524 | 1526 | ||
1525 | public bool Cross(ScenePresence agent, bool isFlying) | 1527 | public bool Cross(ScenePresence agent, bool isFlying) |
1526 | { | 1528 | { |
1529 | agent.IsInLocalTransit = true; | ||
1527 | agent.IsInTransit = true; | 1530 | agent.IsInTransit = true; |
1528 | CrossAsyncDelegate d = CrossAsync; | 1531 | CrossAsyncDelegate d = CrossAsync; |
1529 | d.BeginInvoke(agent, isFlying, CrossCompleted, d); | 1532 | d.BeginInvoke(agent, isFlying, CrossCompleted, d); |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 32cb5a3..2695464 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -175,6 +175,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
175 | { | 175 | { |
176 | client.OnNameFromUUIDRequest -= new UUIDNameRequest(HandleUUIDNameRequest); | 176 | client.OnNameFromUUIDRequest -= new UUIDNameRequest(HandleUUIDNameRequest); |
177 | client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest); | 177 | client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest); |
178 | client.OnConnectionClosed -= new Action<IClientAPI>(HandleConnectionClosed); | ||
178 | } | 179 | } |
179 | 180 | ||
180 | protected virtual void HandleUUIDNameRequest(UUID uuid, IClientAPI client) | 181 | protected virtual void HandleUUIDNameRequest(UUID uuid, IClientAPI client) |