12 files changed, 18 insertions, 14 deletions

diff --git a/OpenSim.Framework/IAssetServer.cs b/OpenSim.Framework/Interfaces/IAssetServer.cs
index a0de548..3f86acc 100644
--- a/OpenSim.Framework/IAssetServer.cs
+++ b/OpenSim.Framework/Interfaces/IAssetServer.cs
@@ -30,7 +30,7 @@ using System.Net.Sockets;
 using System.IO;

 using System.Threading;

 using libsecondlife;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/IConfig.cs
+++ b/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/IGenericConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/IGridConfig.cs b/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/IGridConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/Interfaces/IGridServer.cs
index 9c06a6b..b01f308 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/Interfaces/IGridServer.cs
@@ -27,13 +27,14 @@
 

 

 using System;

-using System.Collections;
+using System.Collections;

 using System.Collections.Generic;

 using System.Net;

 using System.Net.Sockets;

 using System.IO;

 using libsecondlife;

 using OpenSim;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
         string GetName();

         bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

         void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        void Close();
+        void Close();

     }

     

     public struct UUIDBlock

diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 2c45baa..a4d2ba1 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -27,7 +27,7 @@
 

 using System;

 using libsecondlife;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IScriptAPI.cs b/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 2f58198..3ad0f06 100644
--- a/OpenSim.Framework/IScriptAPI.cs
+++ b/OpenSim.Framework/Interfaces/IScriptAPI.cs
@@ -1,6 +1,7 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/IScriptEngine.cs b/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/IScriptEngine.cs
+++ b/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/IUserConfig.cs b/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/IUserConfig.cs
+++ b/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/IUserServer.cs b/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/IUserServer.cs
+++ b/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/Interfaces/LocalGridBase.cs
index 6857d6d..c3ab262 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/Interfaces/LocalGridBase.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using libsecondlife;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index 0b72b9f..f24ec66 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
@@ -1,8 +1,9 @@
 using System;

-using System.Collections;
+using System.Collections;

 using System.Collections.Generic;

 using System.Text;

 using libsecondlife;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Framework.Interfaces

 {

@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
         public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

         public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

         public abstract void Close();

-        public abstract Hashtable GridData {
-                get;
-                set;
-        }
-
-        public abstract ArrayList neighbours {
-                get;
-                set;
-        }
+        public abstract Hashtable GridData {

+                get;

+                set;

+        }

+

+        public abstract ArrayList neighbours {

+                get;

+                set;

+        }

     }

 }