aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-22 20:49:40 -0700
committerDiva Canto2013-07-24 14:29:51 -0700
commite6a0f6e428e32356eba14729766aac28cec9989f (patch)
tree15fd4b62cb3bfa5b9b96647996c58e4159155976
parentMinor adjustment on timings of waits. (diff)
downloadopensim-SC_OLD-e6a0f6e428e32356eba14729766aac28cec9989f.zip
opensim-SC_OLD-e6a0f6e428e32356eba14729766aac28cec9989f.tar.gz
opensim-SC_OLD-e6a0f6e428e32356eba14729766aac28cec9989f.tar.bz2
opensim-SC_OLD-e6a0f6e428e32356eba14729766aac28cec9989f.tar.xz
One more thing to test in order to let CompleteMovement go up the stack.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 43167ee..f40948f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1635,9 +1635,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1635 bool ready = false; 1635 bool ready = false;
1636 while (!ready && count-- > 0) 1636 while (!ready && count-- > 0)
1637 { 1637 {
1638 if (m_scene.TryGetClient(endPoint, out client) && client.IsActive) 1638 if (m_scene.TryGetClient(endPoint, out client) && client.IsActive && client.SceneAgent != null)
1639 { 1639 {
1640 LLUDPClient udpClient = ((LLClientView)client).UDPClient; 1640 LLClientView llClientView = (LLClientView)client;
1641 LLUDPClient udpClient = llClientView.UDPClient;
1641 if (udpClient != null && udpClient.IsConnected) 1642 if (udpClient != null && udpClient.IsConnected)
1642 ready = true; 1643 ready = true;
1643 else 1644 else