aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs14
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs8
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs11
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs5
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
15 files changed, 21 insertions, 47 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 4de4b2b..c8a540b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -25,14 +25,12 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28using System.Reflection;
29 28
29using System.Reflection;
30using log4net; 30using log4net;
31
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.OGS1;
36using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
37using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
38 36
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 39e13d1..5feea4d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -30,8 +30,8 @@
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.Communications.Local;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Region.Communications.Local;
35 35
36namespace OpenSim.Region.Communications.Hypergrid 36namespace OpenSim.Region.Communications.Hypergrid
37{ 37{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index d93918d..72c0f42 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -31,30 +31,22 @@ using System;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Drawing; 33using System.Drawing;
34using System.Drawing.Drawing2D;
35using System.Drawing.Imaging;
36using System.IO;
37using System.Net; 34using System.Net;
38using System.Net.Sockets; 35using System.Net.Sockets;
39using System.Reflection; 36using System.Reflection;
40using System.Runtime.Remoting; 37using System.Runtime.Remoting;
41using System.Runtime.Remoting.Channels;
42using System.Runtime.Remoting.Channels.Tcp;
43using System.Security.Authentication; 38using System.Security.Authentication;
44using System.Threading;
45using OpenMetaverse;
46using OpenMetaverse.Imaging;
47using log4net; 39using log4net;
48using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using OpenMetaverse;
42using OpenMetaverse.Imaging;
49using OpenSim.Framework; 43using OpenSim.Framework;
50using OpenSim.Framework.Communications; 44using OpenSim.Framework.Communications;
51using OpenSim.Framework.Communications.Cache; 45using OpenSim.Framework.Communications.Cache;
52using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
53using OpenSim.Region.Communications.Local;
54using OpenSim.Region.Communications.OGS1; 47using OpenSim.Region.Communications.OGS1;
55// using OpenSim.Region.Environment.Modules.Framework;
56using OpenSim.Region.Framework.Scenes; 48using OpenSim.Region.Framework.Scenes;
57using OpenSim.Region.Framework.Interfaces; 49// using OpenSim.Region.Environment.Modules.Framework;
58 50
59namespace OpenSim.Region.Communications.Hypergrid 51namespace OpenSim.Region.Communications.Hypergrid
60{ 52{
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index d1f416d..94646d2 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -29,18 +29,14 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32 32using log4net;
33using OpenMetaverse;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.Communications.OGS1; 37using OpenSim.Region.Communications.OGS1;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40using OpenMetaverse;
41
42using log4net;
43
44namespace OpenSim.Region.Communications.Hypergrid 40namespace OpenSim.Region.Communications.Hypergrid
45{ 41{
46 public class HGGridServicesGridMode : HGGridServices 42 public class HGGridServicesGridMode : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 0f6b4c7..ea8ac2e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -25,6 +25,7 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28
28using System; 29using System;
29using System.Collections; 30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
35using System.Runtime.Remoting.Channels; 36using System.Runtime.Remoting.Channels;
36using System.Runtime.Remoting.Channels.Tcp; 37using System.Runtime.Remoting.Channels.Tcp;
37using System.Security.Authentication; 38using System.Security.Authentication;
38 39using log4net;
40using Nwc.XmlRpc;
41using OpenMetaverse;
39using OpenSim.Framework; 42using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
44using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
45using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
46 47
47using OpenMetaverse;
48using Nwc.XmlRpc;
49using log4net;
50
51namespace OpenSim.Region.Communications.Hypergrid 48namespace OpenSim.Region.Communications.Hypergrid
52{ 49{
53 public class HGGridServicesStandalone : HGGridServices 50 public class HGGridServicesStandalone : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 874e8fb..8296910 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 084a9e9..e9eb18c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -25,15 +25,9 @@
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; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
33using System.Text.RegularExpressions;
34using OpenMetaverse; 30using OpenMetaverse;
35using log4net;
36using Nwc.XmlRpc;
37using OpenSim.Framework; 31using OpenSim.Framework;
38using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
39using OpenSim.Region.Communications.OGS1; 33using OpenSim.Region.Communications.OGS1;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 6a3b80d..5df3c34 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36 36
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 5cb33cc..d4560be 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,8 +27,8 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse;
31using log4net; 30using log4net;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5cd587d..3ad7249 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,8 +30,8 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index ca48814..d5305cc 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
32using System.Net; 31using System.Net;
33using System.Net.Sockets; 32using System.Net.Sockets;
34using System.Reflection; 33using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
36using System.Runtime.Remoting.Channels; 35using System.Runtime.Remoting.Channels;
37using System.Runtime.Remoting.Channels.Tcp; 36using System.Runtime.Remoting.Channels.Tcp;
38using System.Security.Authentication; 37using System.Security.Authentication;
39using System.Threading;
40using OpenMetaverse;
41using log4net; 38using log4net;
42using Nini.Config;
43using Nwc.XmlRpc; 39using Nwc.XmlRpc;
40using OpenMetaverse;
44using OpenSim.Framework; 41using OpenSim.Framework;
45using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
46using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 0195a58..dd4d0aa 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Runtime.Remoting; 30using System.Runtime.Remoting;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
35namespace OpenSim.Region.Communications.OGS1 35namespace OpenSim.Region.Communications.OGS1
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b9e8394..49d5938 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index c690def..0f4c732 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 94a7a5c..b4b73b0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using OpenMetaverse;
35using log4net; 34using log4net;
36using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39 39