4 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index fc0ba4a..9162bd3 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Threading;

 using System.IO;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;

 using libsecondlife;

 using Db4objects.Db4o;

diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index 311179b..f4b8872 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Threading;

 using System.IO;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 using libsecondlife;

 using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 71fca57..d2f8de1 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -7,7 +7,7 @@ using System.Net.Sockets;
 using System.IO;

 using libsecondlife;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;

 

 namespace OpenSim.GridInterfaces.Remote

diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7cd68df..a475471 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -34,7 +34,7 @@ using System.IO;
 using libsecondlife;

 using Nwc.XmlRpc;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Assets;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.GridInterfaces.Remote

 {

@@ -44,28 +44,28 @@ namespace OpenSim.GridInterfaces.Remote
         private string GridSendKey;

         private string GridRecvKey;

         private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();

-        private ArrayList simneighbours = new ArrayList();
-        private Hashtable griddatahash;
+        private ArrayList simneighbours = new ArrayList();

+        private Hashtable griddatahash;

 

         public override Dictionary<uint, AgentCircuitData> agentcircuits

         {

             get { return AgentCircuits; }

             set { AgentCircuits = value; }

         }

-
+

         public override ArrayList neighbours

         {

             get { return simneighbours; }

             set { simneighbours = value; }

-        }
+        }

 

         public override Hashtable GridData

         {

             get { return griddatahash; }

             set { griddatahash = value; }

-        }
-
-
+        }

+

+

         public RemoteGridServer()

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");

@@ -84,15 +84,15 @@ namespace OpenSim.GridInterfaces.Remote
             XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);

             XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);

             Hashtable GridRespData = (Hashtable)GridResp.Value;

-            this.griddatahash=GridRespData;
+            this.griddatahash=GridRespData;

 

             if(GridRespData.ContainsKey("error")) {

                 string errorstring = (string)GridRespData["error"];

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);

                 return false;

-            }
-            this.neighbours = (ArrayList)GridRespData["neighbours"];
+            }

+            this.neighbours = (ArrayList)GridRespData["neighbours"];

             Console.WriteLine(simneighbours.Count);

             return true;

         }