diff options
| author | Diva Canto | 2013-07-26 16:00:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-26 16:00:16 -0700 |
| commit | 98b65bd5f4b16fecafd745dbaa661debda52f97e (patch) | |
| tree | df60a3e6c8cf9b75ccf4b4b103a3aeb31496db43 | |
| parent | Don't touch the Current Outfit folder also on coming back home (diff) | |
| parent | Revert "Committing the same fix here for the infinity problem on TPs." (diff) | |
| download | opensim-SC_OLD-98b65bd5f4b16fecafd745dbaa661debda52f97e.zip opensim-SC_OLD-98b65bd5f4b16fecafd745dbaa661debda52f97e.tar.gz opensim-SC_OLD-98b65bd5f4b16fecafd745dbaa661debda52f97e.tar.bz2 opensim-SC_OLD-98b65bd5f4b16fecafd745dbaa661debda52f97e.tar.xz | |
Merge branch '0.7.5-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.5-post-fixes
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6ff8da8..3cb1901 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -664,7 +664,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 664 | // | 664 | // |
| 665 | // This sleep can be increased if necessary. However, whilst it's active, | 665 | // This sleep can be increased if necessary. However, whilst it's active, |
| 666 | // an agent cannot teleport back to this region if it has teleported away. | 666 | // an agent cannot teleport back to this region if it has teleported away. |
| 667 | Thread.Sleep(15000); | 667 | Thread.Sleep(2000); |
| 668 | 668 | ||
| 669 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 669 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
| 670 | } | 670 | } |