diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/MessageServersConnector.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 6355c4d..22505cb 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs | |||
@@ -25,23 +25,20 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections; | 28 | using System.Collections; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Text; | 30 | using System.Net; |
32 | using System.Threading; | 31 | using System.Reflection; |
33 | using libsecondlife; | 32 | using libsecondlife; |
33 | using log4net; | ||
34 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Communications.Cache; | ||
37 | using OpenSim.Framework.Console; | ||
38 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
39 | 36 | ||
40 | namespace OpenSim.Grid.UserServer | 37 | namespace OpenSim.Grid.UserServer |
41 | { | 38 | { |
42 | public class MessageServersConnector | 39 | public class MessageServersConnector |
43 | { | 40 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 42 | ||
46 | public Dictionary<string, MessageServerInfo> MessageServers; | 43 | public Dictionary<string, MessageServerInfo> MessageServers; |
47 | 44 | ||
@@ -214,7 +211,7 @@ namespace OpenSim.Grid.UserServer | |||
214 | { | 211 | { |
215 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); | 212 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); |
216 | } | 213 | } |
217 | catch (System.Net.WebException) | 214 | catch (WebException) |
218 | { | 215 | { |
219 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online"); | 216 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online"); |
220 | } | 217 | } |
@@ -249,7 +246,7 @@ namespace OpenSim.Grid.UserServer | |||
249 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); | 246 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); |
250 | m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); | 247 | m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); |
251 | } | 248 | } |
252 | catch (System.Net.WebException) | 249 | catch (WebException) |
253 | { | 250 | { |
254 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); | 251 | m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); |
255 | } | 252 | } |