5 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index b34e126..e0ea94f 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -32,7 +32,6 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenSim.Region.Environment.Interfaces;
-//TODO: Why do we reference InstantMessageModule here?
 using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
 using OpenSim.Region.Environment.Modules.Avatar.Chat;
 using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
@@ -40,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
 using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
 using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
 using OpenSim.Region.Environment.Scenes;
+//TODO: Why do we reference InstantMessageModule here?
 
 namespace OpenSim.Region.Environment
 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 27967bc..91bbdb7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
                         avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
                                                                     capsPath);
                         avatar.MakeChildAgent();
-                        System.Threading.Thread.Sleep(5000);
+                        Thread.Sleep(5000);
                         avatar.CrossAttachmentsIntoNewRegion(regionHandle);
                         if (KillObject != null)
                         {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5164d30..e53cfaa 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Xml;
-using System.Xml.Serialization;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 5f91176..18cae48 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Runtime.Serialization;
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Environment/Scenes/UndoState.cs
index 65c8669..daabd8d 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Environment/Scenes/UndoState.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Region.Environment.Scenes