diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index f0140a5..95192e3 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -6,7 +6,6 @@ using OpenSim.Framework.Data; | |||
6 | using OpenSim.Framework.UserManagement; | 6 | using OpenSim.Framework.UserManagement; |
7 | using OpenSim.Framework.Utilities; | 7 | using OpenSim.Framework.Utilities; |
8 | using OpenSim.Framework.Configuration; | 8 | using OpenSim.Framework.Configuration; |
9 | using OpenSim.Framework.Communications; | ||
10 | 9 | ||
11 | namespace OpenSim.Grid.UserServer | 10 | namespace OpenSim.Grid.UserServer |
12 | { | 11 | { |
@@ -14,8 +13,8 @@ namespace OpenSim.Grid.UserServer | |||
14 | { | 13 | { |
15 | public UserConfig m_config; | 14 | public UserConfig m_config; |
16 | 15 | ||
17 | public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess) | 16 | public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess) |
18 | : base(userManager, inventoryServer, welcomeMess) | 17 | : base(userManager, welcomeMess) |
19 | { | 18 | { |
20 | m_config = config; | 19 | m_config = config; |
21 | } | 20 | } |
@@ -72,29 +71,25 @@ namespace OpenSim.Grid.UserServer | |||
72 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 71 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
73 | 72 | ||
74 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); | 73 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); |
75 | // Send | 74 | // Send |
76 | try | 75 | try |
77 | { | 76 | { |
78 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 77 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
79 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); | 78 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); |
80 | } | 79 | } |
81 | catch( WebException e ) | 80 | catch( WebException e ) |
82 | { | 81 | { |
83 | switch( e.Status ) | 82 | switch( e.Status ) |
84 | { | 83 | { |
85 | case WebExceptionStatus.Timeout: | 84 | case WebExceptionStatus.Timeout: |
86 | //TODO: Send him to nearby or default region instead | 85 | //TODO: Send him to nearby or default region instead |
87 | break; | 86 | break; |
88 | 87 | ||
89 | default: | 88 | default: |
90 | throw; | 89 | throw; |
91 | } | 90 | } |
92 | } | 91 | } |
93 | } | 92 | } |
94 | } | 93 | } |
95 | } | 94 | } |
96 | 95 | ||
97 | |||
98 | |||
99 | |||
100 | |||