1 files changed, 18 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 3820575..95192e3 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -71,9 +71,24 @@ namespace OpenSim.Grid.UserServer
            theUser.currentAgent.currentHandle = SimInfo.regionHandle;
            System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
-            // Send
+            // Send
-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
+            try
-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);
+            {
+                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
+                XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
+            }
+            catch( WebException e )
+            {
+                switch( e.Status )
+                {
+                    case WebExceptionStatus.Timeout:
+                        //TODO: Send him to nearby or default region instead
+                        break;
+                       
+                    default:
+                        throw;
+                }
+            }
        }
    }
 }

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 3820575..95192e3 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -71,9 +71,24 @@ namespace OpenSim.Grid.UserServer
71	theUser.currentAgent.currentHandle = SimInfo.regionHandle;	71	theUser.currentAgent.currentHandle = SimInfo.regionHandle;
72		72
73	System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);	73	System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
74	// Send	74	// Send
75	XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);	75	try
76	XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);	76	{
		77	XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
		78	XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
		79	}
		80	catch( WebException e )
		81	{
		82	switch( e.Status )
		83	{
		84	case WebExceptionStatus.Timeout:
		85	//TODO: Send him to nearby or default region instead
		86	break;
		87
		88	default:
		89	throw;
		90	}
		91	}
77	}	92	}
78	}	93	}
79	}	94	}