* Now login swallows WebException.Timeout; (thanks cfk!)

(we should really implement some nearby/default known-up algorithm here)

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
-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);
+            // Send

+            try

+            {

+                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;

+                }

+            }
         }
     }
 }