aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-08-08 00:52:41 +0100
committerUbitUmarov2014-08-08 00:52:41 +0100
commit2a457c862e6b5cc63408803aa262977aa5585f38 (patch)
tree902549e6b4704d659e5345b58d1cb77fed6499a7 /OpenSim
parentback to max 15 wearables until its safe ( and before i kill other grid (diff)
parentReduce delay time on regin handshake reply to speed up terrain sending. (diff)
downloadopensim-SC-2a457c862e6b5cc63408803aa262977aa5585f38.zip
opensim-SC-2a457c862e6b5cc63408803aa262977aa5585f38.tar.gz
opensim-SC-2a457c862e6b5cc63408803aa262977aa5585f38.tar.bz2
opensim-SC-2a457c862e6b5cc63408803aa262977aa5585f38.tar.xz
Merge branch 'master' into ubitworkmaster
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e9a087b..8a28faf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6481,7 +6481,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6481 Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply; 6481 Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply;
6482 if (handlerRegionHandShakeReply != null) 6482 if (handlerRegionHandShakeReply != null)
6483 { 6483 {
6484 Thread.Sleep(500); 6484 Thread.Sleep(100);
6485 handlerRegionHandShakeReply(this); 6485 handlerRegionHandShakeReply(this);
6486 } 6486 }
6487 6487