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 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System.Reflection;
+using System.Reflection;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.OGS1;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
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 @@
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Communications.Local;
 namespace OpenSim.Region.Communications.Hypergrid
 {
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;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-// using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
+// using OpenSim.Region.Environment.Modules.Framework;
 namespace OpenSim.Region.Communications.Hypergrid
 {
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 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 namespace OpenSim.Region.Communications.Hypergrid
 {
    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 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
+using log4net;
+using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using Nwc.XmlRpc;
-using log4net;
 namespace OpenSim.Region.Communications.Hypergrid
 {
    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;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using OpenMetaverse;
-using log4net;
-using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
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 @@
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
-using Nini.Config;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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 @@
 using System;
 using System.Reflection;
 using System.Runtime.Remoting;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 namespace 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;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using 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;
 using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;

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	*/
28	using System.Reflection;
29		28
		29	using System.Reflection;
30	using log4net;	30	using log4net;
31
32	using OpenSim.Framework;	31	using OpenSim.Framework;
33	using OpenSim.Framework.Communications;	32	using OpenSim.Framework.Communications;
34	using OpenSim.Framework.Communications.Cache;	33	using OpenSim.Framework.Communications.Cache;
35	using OpenSim.Region.Communications.OGS1;
36	using OpenSim.Framework.Servers;	34	using OpenSim.Framework.Servers;
37	using OpenSim.Region.Framework.Scenes;	35	using 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 @@
30	using OpenSim.Framework;	30	using OpenSim.Framework;
31	using OpenSim.Framework.Communications;	31	using OpenSim.Framework.Communications;
32	using OpenSim.Framework.Communications.Cache;	32	using OpenSim.Framework.Communications.Cache;
33	using OpenSim.Region.Communications.Local;
34	using OpenSim.Framework.Servers;	33	using OpenSim.Framework.Servers;
		34	using OpenSim.Region.Communications.Local;
35		35
36	namespace OpenSim.Region.Communications.Hypergrid	36	namespace 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;
31	using System.Collections;	31	using System.Collections;
32	using System.Collections.Generic;	32	using System.Collections.Generic;
33	using System.Drawing;	33	using System.Drawing;
34	using System.Drawing.Drawing2D;
35	using System.Drawing.Imaging;
36	using System.IO;
37	using System.Net;	34	using System.Net;
38	using System.Net.Sockets;	35	using System.Net.Sockets;
39	using System.Reflection;	36	using System.Reflection;
40	using System.Runtime.Remoting;	37	using System.Runtime.Remoting;
41	using System.Runtime.Remoting.Channels;
42	using System.Runtime.Remoting.Channels.Tcp;
43	using System.Security.Authentication;	38	using System.Security.Authentication;
44	using System.Threading;
45	using OpenMetaverse;
46	using OpenMetaverse.Imaging;
47	using log4net;	39	using log4net;
48	using Nwc.XmlRpc;	40	using Nwc.XmlRpc;
		41	using OpenMetaverse;
		42	using OpenMetaverse.Imaging;
49	using OpenSim.Framework;	43	using OpenSim.Framework;
50	using OpenSim.Framework.Communications;	44	using OpenSim.Framework.Communications;
51	using OpenSim.Framework.Communications.Cache;	45	using OpenSim.Framework.Communications.Cache;
52	using OpenSim.Framework.Servers;	46	using OpenSim.Framework.Servers;
53	using OpenSim.Region.Communications.Local;
54	using OpenSim.Region.Communications.OGS1;	47	using OpenSim.Region.Communications.OGS1;
55	// using OpenSim.Region.Environment.Modules.Framework;
56	using OpenSim.Region.Framework.Scenes;	48	using OpenSim.Region.Framework.Scenes;
57	using OpenSim.Region.Framework.Interfaces;	49	// using OpenSim.Region.Environment.Modules.Framework;
58		50
59	namespace OpenSim.Region.Communications.Hypergrid	51	namespace 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 @@
29	using System;	29	using System;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Reflection;	31	using System.Reflection;
32		32	using log4net;
		33	using OpenMetaverse;
33	using OpenSim.Framework;	34	using OpenSim.Framework;
34	using OpenSim.Framework.Communications;
35	using OpenSim.Framework.Communications.Cache;	35	using OpenSim.Framework.Communications.Cache;
36	using OpenSim.Framework.Servers;	36	using OpenSim.Framework.Servers;
37	using OpenSim.Region.Communications.OGS1;	37	using OpenSim.Region.Communications.OGS1;
38	using OpenSim.Region.Framework.Scenes;	38	using OpenSim.Region.Framework.Scenes;
39		39
40	using OpenMetaverse;
41
42	using log4net;
43
44	namespace OpenSim.Region.Communications.Hypergrid	40	namespace 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
28	using System;	29	using System;
29	using System.Collections;	30	using System.Collections;
30	using System.Collections.Generic;	31	using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
35	using System.Runtime.Remoting.Channels;	36	using System.Runtime.Remoting.Channels;
36	using System.Runtime.Remoting.Channels.Tcp;	37	using System.Runtime.Remoting.Channels.Tcp;
37	using System.Security.Authentication;	38	using System.Security.Authentication;
38		39	using log4net;
		40	using Nwc.XmlRpc;
		41	using OpenMetaverse;
39	using OpenSim.Framework;	42	using OpenSim.Framework;
40	using OpenSim.Framework.Communications;
41	using OpenSim.Framework.Communications.Cache;
42	using OpenSim.Framework.Servers;	43	using OpenSim.Framework.Servers;
43	using OpenSim.Region.Communications.Local;	44	using OpenSim.Region.Communications.Local;
44	using OpenSim.Region.Communications.OGS1;	45	using OpenSim.Region.Communications.OGS1;
45	using OpenSim.Region.Framework.Scenes;	46	using OpenSim.Region.Framework.Scenes;
46		47
47	using OpenMetaverse;
48	using Nwc.XmlRpc;
49	using log4net;
50
51	namespace OpenSim.Region.Communications.Hypergrid	48	namespace 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;
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 OpenMetaverse;
33	using log4net;	32	using log4net;
		33	using OpenMetaverse;
34	using OpenSim.Framework;	34	using OpenSim.Framework;
35	using OpenSim.Framework.Communications;	35	using OpenSim.Framework.Communications;
36	using OpenSim.Framework.Communications.Cache;	36	using 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
28	using System;
29	using System.Collections;	28	using System.Collections;
30	using System.Collections.Generic;	29	using System.Collections.Generic;
31	using System.Net;
32	using System.Reflection;
33	using System.Text.RegularExpressions;
34	using OpenMetaverse;	30	using OpenMetaverse;
35	using log4net;
36	using Nwc.XmlRpc;
37	using OpenSim.Framework;	31	using OpenSim.Framework;
38	using OpenSim.Framework.Communications;	32	using OpenSim.Framework.Communications;
39	using OpenSim.Region.Communications.OGS1;	33	using 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;
29	using System.Collections;	29	using System.Collections;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Reflection;	31	using System.Reflection;
32	using OpenMetaverse;
33	using log4net;	32	using log4net;
		33	using OpenMetaverse;
34	using OpenSim.Framework;	34	using OpenSim.Framework;
35	using OpenSim.Framework.Communications;	35	using 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
28	using System.Collections.Generic;	28	using System.Collections.Generic;
29	using System.Reflection;	29	using System.Reflection;
30	using OpenMetaverse;
31	using log4net;	30	using log4net;
		31	using OpenMetaverse;
32	using OpenSim.Framework;	32	using OpenSim.Framework;
33	using OpenSim.Framework.Communications;	33	using OpenSim.Framework.Communications;
34	using OpenSim.Framework.Communications.Cache;	34	using 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;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Reflection;	31	using System.Reflection;
32	using System.Text.RegularExpressions;	32	using System.Text.RegularExpressions;
33	using OpenMetaverse;
34	using log4net;	33	using log4net;
		34	using OpenMetaverse;
35	using OpenSim.Framework;	35	using OpenSim.Framework;
36	using OpenSim.Framework.Communications;	36	using OpenSim.Framework.Communications;
37	using OpenSim.Framework.Communications.Cache;	37	using 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 @@
28	using System;	28	using System;
29	using System.Collections;	29	using System.Collections;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.IO;
32	using System.Net;	31	using System.Net;
33	using System.Net.Sockets;	32	using System.Net.Sockets;
34	using System.Reflection;	33	using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
36	using System.Runtime.Remoting.Channels;	35	using System.Runtime.Remoting.Channels;
37	using System.Runtime.Remoting.Channels.Tcp;	36	using System.Runtime.Remoting.Channels.Tcp;
38	using System.Security.Authentication;	37	using System.Security.Authentication;
39	using System.Threading;
40	using OpenMetaverse;
41	using log4net;	38	using log4net;
42	using Nini.Config;
43	using Nwc.XmlRpc;	39	using Nwc.XmlRpc;
		40	using OpenMetaverse;
44	using OpenSim.Framework;	41	using OpenSim.Framework;
45	using OpenSim.Framework.Communications;	42	using OpenSim.Framework.Communications;
46	using OpenSim.Framework.Servers;	43	using 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 @@
28	using System;	28	using System;
29	using System.Reflection;	29	using System.Reflection;
30	using System.Runtime.Remoting;	30	using System.Runtime.Remoting;
31	using OpenMetaverse;
32	using log4net;	31	using log4net;
		32	using OpenMetaverse;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34		34
35	namespace OpenSim.Region.Communications.OGS1	35	namespace 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;
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 OpenMetaverse;
33	using log4net;	32	using log4net;
		33	using OpenMetaverse;
34	using OpenSim.Framework;	34	using OpenSim.Framework;
35	using OpenSim.Framework.Communications;	35	using OpenSim.Framework.Communications;
36	using OpenSim.Framework.Communications.Cache;	36	using 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;
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 OpenMetaverse;
33	using log4net;	32	using log4net;
		33	using OpenMetaverse;
34	using OpenSim.Framework;	34	using OpenSim.Framework;
35	using OpenSim.Framework.Communications;	35	using OpenSim.Framework.Communications;
36	using OpenSim.Framework.Communications.Cache;	36	using 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;
31	using System.Net;	31	using System.Net;
32	using System.Reflection;	32	using System.Reflection;
33	using System.Text.RegularExpressions;	33	using System.Text.RegularExpressions;
34	using OpenMetaverse;
35	using log4net;	34	using log4net;
36	using Nwc.XmlRpc;	35	using Nwc.XmlRpc;
		36	using OpenMetaverse;
37	using OpenSim.Framework;	37	using OpenSim.Framework;
38	using OpenSim.Framework.Communications;	38	using OpenSim.Framework.Communications;
39		39