diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 49fd70a..3f41457 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | |||
@@ -24,21 +24,18 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System; | 27 | using System.Collections; |
28 | using System.Collections; | 28 | using System.Collections.Generic; |
29 | using System.Collections.Generic; | 29 | using System.Net; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Net; | 31 | using log4net; |
32 | using System.Threading; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using Nwc.XmlRpc; |
34 | using log4net; | 34 | using OpenMetaverse; |
35 | using Nini.Config; | 35 | using OpenSim.Framework; |
36 | using Nwc.XmlRpc; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Framework.Client; | 38 | |
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 39 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 40 | { |
44 | public class PresenceModule : IRegionModule, IPresenceModule | 41 | public class PresenceModule : IRegionModule, IPresenceModule |
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
344 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); | 341 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); |
345 | } | 342 | } |
346 | } | 343 | } |
347 | catch (System.Net.WebException) | 344 | catch (WebException) |
348 | { | 345 | { |
349 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); | 346 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); |
350 | } | 347 | } |
@@ -367,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
367 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); | 364 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); |
368 | } | 365 | } |
369 | } | 366 | } |
370 | catch (System.Net.WebException) | 367 | catch (WebException) |
371 | { | 368 | { |
372 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); | 369 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); |
373 | } | 370 | } |
@@ -392,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
392 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); | 389 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); |
393 | } | 390 | } |
394 | } | 391 | } |
395 | catch (System.Net.WebException) | 392 | catch (WebException) |
396 | { | 393 | { |
397 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); | 394 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); |
398 | } | 395 | } |
@@ -417,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
417 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); | 414 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); |
418 | } | 415 | } |
419 | } | 416 | } |
420 | catch (System.Net.WebException) | 417 | catch (WebException) |
421 | { | 418 | { |
422 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); | 419 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); |
423 | } | 420 | } |