diff options
author | Melanie Thielker | 2014-08-13 03:05:25 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-08-13 03:05:25 +0200 |
commit | ecae45a21e4dff4986ff90f10a6eae54f95b391c (patch) | |
tree | 08a8772c150ec7cfd778056e2b8ae0390b412b74 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | Merge branch 'ubitworkmaster' (diff) | |
download | opensim-SC_OLD-ecae45a21e4dff4986ff90f10a6eae54f95b391c.zip opensim-SC_OLD-ecae45a21e4dff4986ff90f10a6eae54f95b391c.tar.gz opensim-SC_OLD-ecae45a21e4dff4986ff90f10a6eae54f95b391c.tar.bz2 opensim-SC_OLD-ecae45a21e4dff4986ff90f10a6eae54f95b391c.tar.xz |
Revert "make HandlerRegionHandshakeReply processing async and delay it a bit. This"
This reverts commit 30f00bfb14cce582382bd37b1e22062af664ec64.
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 8a28faf..aa742ef 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -4884,7 +4884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4884 | float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 4884 | float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
4885 | { | 4885 | { |
4886 | // m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name); | 4886 | // m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name); |
4887 | 4887 | ||
4888 | LandData landData = lo.LandData; | 4888 | LandData landData = lo.LandData; |
4889 | 4889 | ||
4890 | ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage(); | 4890 | ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage(); |
@@ -5522,10 +5522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5522 | AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); | 5522 | AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); |
5523 | AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); | 5523 | AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); |
5524 | AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); | 5524 | AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); |
5525 | 5525 | AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false); | |
5526 | // AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false); | ||
5527 | AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, true); | ||
5528 | |||
5529 | AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest); | 5526 | AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest); |
5530 | AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance); | 5527 | AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance); |
5531 | AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing); | 5528 | AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing); |
@@ -6481,7 +6478,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6481 | Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply; | 6478 | Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply; |
6482 | if (handlerRegionHandShakeReply != null) | 6479 | if (handlerRegionHandShakeReply != null) |
6483 | { | 6480 | { |
6484 | Thread.Sleep(100); | ||
6485 | handlerRegionHandShakeReply(this); | 6481 | handlerRegionHandShakeReply(this); |
6486 | } | 6482 | } |
6487 | 6483 | ||