From 5246dc33dcfc51b7ebb19b269159df3991029350 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 13 Aug 2009 14:10:12 -0700 Subject: Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves. --- .../Framework/Scenes/SceneCommunicationService.cs | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs') 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 public bool WaitForCallback(UUID id) { - int count = 20; + int count = 200; while (m_agentsInTransit.Contains(id) && count-- > 0) { //m_log.Debug(" >>> Waiting... " + count); - Thread.Sleep(1000); + Thread.Sleep(100); } if (count > 0) @@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes { pos = pos + (agent.Velocity); - CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); - if (userInfo != null) - { - userInfo.DropInventory(); - } - else - { - m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", - agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); - } + //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); + //if (userInfo != null) + //{ + // userInfo.DropInventory(); + //} + //else + //{ + // m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", + // agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); + //} //bool crossingSuccessful = // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, -- cgit v1.1