diff options
author | Adam Frisby | 2008-05-01 14:45:56 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 14:45:56 +0000 |
commit | 4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch) | |
tree | 34da13ca5f7f19fc447f4fd341a43703183cfd55 /OpenSim/Region/Environment | |
parent | Update svn properties. Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.zip opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.gz opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.bz2 opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.xz |
* Assorted spring cleanings.
Diffstat (limited to 'OpenSim/Region/Environment')
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; | |||
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | //TODO: Why do we reference InstantMessageModule here? | ||
36 | using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; | 35 | using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; |
37 | using OpenSim.Region.Environment.Modules.Avatar.Chat; | 36 | using OpenSim.Region.Environment.Modules.Avatar.Chat; |
38 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; | 37 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; |
@@ -40,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; | |||
40 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; | 39 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; |
41 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | 40 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; |
42 | using OpenSim.Region.Environment.Scenes; | 41 | using OpenSim.Region.Environment.Scenes; |
42 | //TODO: Why do we reference InstantMessageModule here? | ||
43 | 43 | ||
44 | namespace OpenSim.Region.Environment | 44 | namespace OpenSim.Region.Environment |
45 | { | 45 | { |
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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Threading; | ||
32 | using libsecondlife; | 33 | using libsecondlife; |
33 | using log4net; | 34 | using log4net; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
580 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), | 581 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), |
581 | capsPath); | 582 | capsPath); |
582 | avatar.MakeChildAgent(); | 583 | avatar.MakeChildAgent(); |
583 | System.Threading.Thread.Sleep(5000); | 584 | Thread.Sleep(5000); |
584 | avatar.CrossAttachmentsIntoNewRegion(regionHandle); | 585 | avatar.CrossAttachmentsIntoNewRegion(regionHandle); |
585 | if (KillObject != null) | 586 | if (KillObject != null) |
586 | { | 587 | { |
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; | |||
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using System.Xml.Serialization; | ||
34 | using Axiom.Math; | 33 | using Axiom.Math; |
35 | using libsecondlife; | 34 | using libsecondlife; |
36 | using libsecondlife.Packets; | 35 | 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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Drawing; | 30 | using System.Drawing; |
32 | using System.Runtime.Serialization; | 31 | 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 @@ | |||
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.Generic; | ||
30 | using libsecondlife; | 28 | using libsecondlife; |
31 | 29 | ||
32 | namespace OpenSim.Region.Environment.Scenes | 30 | namespace OpenSim.Region.Environment.Scenes |