aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/CoreModules/Avatar/InstantMessage
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs28
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs35
3 files changed, 39 insertions, 49 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3ad2c91..7556388 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,21 +24,16 @@
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 */
27using System; 27using System.Collections.Generic;
28using System.Collections; 28using System.Reflection;
29using System.Collections.Generic; 29using log4net;
30using System.Reflection; 30using Nini.Config;
31using System.Net; 31using OpenMetaverse;
32using System.Threading; 32using OpenSim.Framework;
33using OpenMetaverse; 33using OpenSim.Framework.Client;
34using log4net; 34using OpenSim.Region.Framework.Interfaces;
35using Nini.Config; 35using OpenSim.Region.Framework.Scenes;
36using Nwc.XmlRpc; 36
37using OpenSim.Framework;
38using OpenSim.Framework.Client;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 37namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 38{
44 public class InstantMessageModule : IRegionModule 39 public class InstantMessageModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 91c22eb..beff362 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -24,21 +24,19 @@
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 */
27using System; 27using System;
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Net;
31using System.Net; 31using System.Reflection;
32using System.Threading; 32using log4net;
33using OpenMetaverse; 33using Nini.Config;
34using log4net; 34using Nwc.XmlRpc;
35using Nini.Config; 35using OpenMetaverse;
36using Nwc.XmlRpc; 36using OpenSim.Framework;
37using OpenSim.Framework; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Framework.Client; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Interfaces; 39
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
43{ 41{
44 public class MessageTransferModule : IRegionModule, IMessageTransferModule 42 public class MessageTransferModule : IRegionModule, IMessageTransferModule
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 */
27using System; 27using System.Collections;
28using System.Collections; 28using System.Collections.Generic;
29using System.Collections.Generic; 29using System.Net;
30using System.Reflection; 30using System.Reflection;
31using System.Net; 31using log4net;
32using System.Threading; 32using Nini.Config;
33using OpenMetaverse; 33using Nwc.XmlRpc;
34using log4net; 34using OpenMetaverse;
35using Nini.Config; 35using OpenSim.Framework;
36using Nwc.XmlRpc; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Framework; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Framework.Client; 38
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41
42namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 39namespace 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 }