aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Hypergrid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
5 files changed, 3 insertions, 28 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index cc82a48..4039288 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -27,20 +27,13 @@
27 */ 27 */
28 28
29using System; 29using System;
30using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.Threading; 32using System.Threading;
34
35using log4net; 33using log4net;
36using Nini.Config;
37using OpenMetaverse; 34using OpenMetaverse;
38
39using OpenSim.Framework; 35using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Scenes;
44 37
45//using HyperGrid.Framework; 38//using HyperGrid.Framework;
46//using OpenSim.Region.Communications.Hypergrid; 39//using OpenSim.Region.Communications.Hypergrid;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
index 7249029..ad98273 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
30using System.Net; 29using System.Net;
31using OpenSim.Framework; 30using System.Reflection;
32using OpenSim.Framework.Communications;
33using OpenMetaverse;
34using log4net; 31using log4net;
35using Nini.Config; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Region.Framework.Scenes.Hypergrid 35namespace OpenSim.Region.Framework.Scenes.Hypergrid
38{ 36{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index c6d2bfc..ea03cf9 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -26,21 +26,13 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections;
31using System.Collections.Generic;
32using System.Reflection; 29using System.Reflection;
33using System.Threading;
34
35using log4net; 30using log4net;
36using Nini.Config; 31using Nini.Config;
37using OpenMetaverse; 32using OpenMetaverse;
38
39using OpenSim.Framework; 33using OpenSim.Framework;
40using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Scenes;
44 36
45namespace OpenSim.Region.Framework.Scenes.Hypergrid 37namespace OpenSim.Region.Framework.Scenes.Hypergrid
46{ 38{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index 1cb98db..558dfb4 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -26,15 +26,9 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections.Generic;
31
32using OpenMetaverse; 29using OpenMetaverse;
33
34using OpenSim.Framework; 30using OpenSim.Framework;
35
36using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Framework.Scenes;
38using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 32using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
39 33
40namespace OpenSim.Region.Framework.Scenes.Hypergrid 34namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index a17df71..f75ea8e 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -33,12 +33,10 @@ using System.Reflection;
33using System.Threading; 33using System.Threading;
34using log4net; 34using log4net;
35using OpenMetaverse; 35using OpenMetaverse;
36using OSD = OpenMetaverse.StructuredData.OSD;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities; 39using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
43 41
44namespace OpenSim.Region.Framework.Scenes.Hypergrid 42namespace OpenSim.Region.Framework.Scenes.Hypergrid