diff options
| author | diva | 2008-12-21 19:00:30 +0000 |
|---|---|---|
| committer | diva | 2008-12-21 19:00:30 +0000 |
| commit | 7d837a9beafe5eba69a199dcaf7e48c24b5255c8 (patch) | |
| tree | be1be00de38c8029052be3b73f0a7ee164986db8 /OpenSim | |
| parent | Change XEngine money() event routing to always raise the money() (diff) | |
| download | opensim-SC-7d837a9beafe5eba69a199dcaf7e48c24b5255c8.zip opensim-SC-7d837a9beafe5eba69a199dcaf7e48c24b5255c8.tar.gz opensim-SC-7d837a9beafe5eba69a199dcaf7e48c24b5255c8.tar.bz2 opensim-SC-7d837a9beafe5eba69a199dcaf7e48c24b5255c8.tar.xz | |
Slowing TPs down a bit further.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 8 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 3bc7fd1..ced5b86 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
| @@ -198,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 198 | agent.child = true; | 198 | agent.child = true; |
| 199 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) | 199 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) |
| 200 | { | 200 | { |
| 201 | Thread.Sleep(1000); | 201 | Thread.Sleep(2000); |
| 202 | 202 | ||
| 203 | // brand new agent | 203 | // brand new agent |
| 204 | agent.CapsPath = Util.GetRandomCapsPath(); | 204 | agent.CapsPath = Util.GetRandomCapsPath(); |
| @@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 208 | return; | 208 | return; |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | Thread.Sleep(2000); | 211 | Thread.Sleep(3000); |
| 212 | 212 | ||
| 213 | // TODO Should construct this behind a method | 213 | // TODO Should construct this behind a method |
| 214 | capsPath = | 214 | capsPath = |
| @@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 251 | // return; | 251 | // return; |
| 252 | //} | 252 | //} |
| 253 | 253 | ||
| 254 | Thread.Sleep(5000); | 254 | Thread.Sleep(7000); |
| 255 | 255 | ||
| 256 | m_log.DebugFormat( | 256 | m_log.DebugFormat( |
| 257 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID); | 257 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID); |
| @@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 293 | /// | 293 | /// |
| 294 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) | 294 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) |
| 295 | { | 295 | { |
| 296 | Thread.Sleep(2000); | 296 | Thread.Sleep(5000); |
| 297 | CloseConnection(avatar.UUID); | 297 | CloseConnection(avatar.UUID); |
| 298 | } | 298 | } |
| 299 | // if (teleport success) // seems to be always success here | 299 | // if (teleport success) // seems to be always success here |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index bce87b7..2b30c0d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
| @@ -784,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 784 | agent.child = true; | 784 | agent.child = true; |
| 785 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 785 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
| 786 | { | 786 | { |
| 787 | Thread.Sleep(1000); | 787 | Thread.Sleep(2000); |
| 788 | 788 | ||
| 789 | // brand new agent | 789 | // brand new agent |
| 790 | agent.CapsPath = Util.GetRandomCapsPath(); | 790 | agent.CapsPath = Util.GetRandomCapsPath(); |
| @@ -794,7 +794,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 794 | return; | 794 | return; |
| 795 | } | 795 | } |
| 796 | 796 | ||
| 797 | Thread.Sleep(2000); | 797 | Thread.Sleep(3000); |
| 798 | 798 | ||
| 799 | // TODO Should construct this behind a method | 799 | // TODO Should construct this behind a method |
| 800 | capsPath = | 800 | capsPath = |
| @@ -835,7 +835,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 835 | // return; | 835 | // return; |
| 836 | //} | 836 | //} |
| 837 | 837 | ||
| 838 | Thread.Sleep(5000); | 838 | Thread.Sleep(7000); |
| 839 | 839 | ||
| 840 | m_log.DebugFormat( | 840 | m_log.DebugFormat( |
| 841 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); | 841 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); |
| @@ -866,7 +866,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 866 | 866 | ||
| 867 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 867 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
| 868 | { | 868 | { |
| 869 | Thread.Sleep(2000); | 869 | Thread.Sleep(5000); |
| 870 | CloseConnection(avatar.UUID); | 870 | CloseConnection(avatar.UUID); |
| 871 | } | 871 | } |
| 872 | 872 | ||