aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 14:45:56 +0000
committerAdam Frisby2008-05-01 14:45:56 +0000
commit4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch)
tree34da13ca5f7f19fc447f4fd341a43703183cfd55 /OpenSim/Region/Environment/Scenes
parentUpdate svn properties. Minor formatting cleanup. (diff)
downloadopensim-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/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/UndoState.cs2
4 files changed, 2 insertions, 5 deletions
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using System.Threading;
32using libsecondlife; 33using libsecondlife;
33using log4net; 34using log4net;
34using OpenSim.Framework; 35using 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;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Xml; 32using System.Xml;
33using System.Xml.Serialization;
34using Axiom.Math; 33using Axiom.Math;
35using libsecondlife; 34using libsecondlife;
36using libsecondlife.Packets; 35using 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
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Drawing; 30using System.Drawing;
32using System.Runtime.Serialization; 31using 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
28using System;
29using System.Collections.Generic;
30using libsecondlife; 28using libsecondlife;
31 29
32namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Environment.Scenes