aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-07-30 21:11:11 +0100
committerUbitUmarov2014-07-30 21:11:11 +0100
commit30f00bfb14cce582382bd37b1e22062af664ec64 (patch)
tree55a684234a8f80fe4f0696d53f673f753f79c638
parent restrict other avatar sounds to parcel flags ( untested ) (diff)
downloadopensim-SC_OLD-30f00bfb14cce582382bd37b1e22062af664ec64.zip
opensim-SC_OLD-30f00bfb14cce582382bd37b1e22062af664ec64.tar.gz
opensim-SC_OLD-30f00bfb14cce582382bd37b1e22062af664ec64.tar.bz2
opensim-SC_OLD-30f00bfb14cce582382bd37b1e22062af664ec64.tar.xz
make HandlerRegionHandshakeReply processing async and delay it a bit. This
delays things like terrain height map sending, giving chance to completemovent to send more priority information. POssible things on this should be on other event trigger when its more apropriate really done.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3c44c5f..34a2797 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4879,7 +4879,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4879 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 4879 float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
4880 { 4880 {
4881// m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name); 4881// m_log.DebugFormat("[LLCLIENTVIEW]: Sending land properties for {0} to {1}", lo.LandData.GlobalID, Name);
4882 4882
4883 LandData landData = lo.LandData; 4883 LandData landData = lo.LandData;
4884 4884
4885 ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage(); 4885 ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage();
@@ -5517,7 +5517,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5517 AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); 5517 AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
5518 AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); 5518 AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
5519 AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); 5519 AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
5520 AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false); 5520
5521// AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
5522 AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, true);
5523
5521 AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest); 5524 AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest);
5522 AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance); 5525 AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance);
5523 AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing); 5526 AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing);
@@ -6473,6 +6476,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6473 Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply; 6476 Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply;
6474 if (handlerRegionHandShakeReply != null) 6477 if (handlerRegionHandShakeReply != null)
6475 { 6478 {
6479 Thread.Sleep(500);
6476 handlerRegionHandShakeReply(this); 6480 handlerRegionHandShakeReply(this);
6477 } 6481 }
6478 6482