diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index af2753c..f28352c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1020,11 +1020,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1020 | 1020 | ||
1021 | public bool WaitForCallback(UUID id) | 1021 | public bool WaitForCallback(UUID id) |
1022 | { | 1022 | { |
1023 | int count = 20; | 1023 | int count = 200; |
1024 | while (m_agentsInTransit.Contains(id) && count-- > 0) | 1024 | while (m_agentsInTransit.Contains(id) && count-- > 0) |
1025 | { | 1025 | { |
1026 | //m_log.Debug(" >>> Waiting... " + count); | 1026 | //m_log.Debug(" >>> Waiting... " + count); |
1027 | Thread.Sleep(1000); | 1027 | Thread.Sleep(100); |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | if (count > 0) | 1030 | if (count > 0) |
@@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1141 | { | 1141 | { |
1142 | pos = pos + (agent.Velocity); | 1142 | pos = pos + (agent.Velocity); |
1143 | 1143 | ||
1144 | CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); | 1144 | //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); |
1145 | if (userInfo != null) | 1145 | //if (userInfo != null) |
1146 | { | 1146 | //{ |
1147 | userInfo.DropInventory(); | 1147 | // userInfo.DropInventory(); |
1148 | } | 1148 | //} |
1149 | else | 1149 | //else |
1150 | { | 1150 | //{ |
1151 | m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", | 1151 | // m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", |
1152 | agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); | 1152 | // agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); |
1153 | } | 1153 | //} |
1154 | 1154 | ||
1155 | //bool crossingSuccessful = | 1155 | //bool crossingSuccessful = |
1156 | // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, | 1156 | // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, |