66 files changed, 342 insertions, 5432 deletions
diff --git a/src/VersionInfo.cs.template b/OpenSim.Framework.Console/MainConsole.cs
index e4e1b95..02c4ae8 100644
--- a/src/VersionInfo.cs.template
+++ b/OpenSim.Framework.Console/MainConsole.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (c) OpenSim project, http://osgrid.org/
+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -22,16 +22,27 @@ Copyright (c) OpenSim project, http://osgrid.org/
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
 */
 using System;
-namespace OpenSim
+namespace OpenSim.Framework.Console
 {
-        /// <summary>
+        public class MainConsole {
-        /// </summary>
+                
-        public class VersionInfo
+                private static ConsoleBase instance;
-        {
+                
-                public static string Version = "@@VERSION"; 
+                public static ConsoleBase Instance 
-        }
+                {
+                        get 
+                        {
+                                return instance;
+                        }
+                        set
+                        {
+                                instance = value;
+                        }
+                }
+    }
 }
diff --git a/src/HeightMapGenHills.cs b/OpenSim.Framework/HeightMapGenHills.cs
index e7589af..6a729da 100644
--- a/src/HeightMapGenHills.cs
+++ b/OpenSim.Framework/HeightMapGenHills.cs
@@ -27,7 +27,7 @@
 using System;
-namespace OpenSim
+namespace OpenSim.Framework.Terrain
 {
    public class HeightmapGenHills
    {
diff --git a/src/GridInterfaces/IAssetServer.cs b/OpenSim.Framework/IAssetServer.cs
index 6050a6c..a0de548 100644
--- a/src/GridInterfaces/IAssetServer.cs
+++ b/OpenSim.Framework/IAssetServer.cs
@@ -30,53 +30,39 @@ using System.Net.Sockets;
 using System.IO;
 using System.Threading;
 using libsecondlife;
+using OpenSim.Framework.Assets;
+namespace OpenSim.Framework.Interfaces
-namespace OpenSim.GridServers
 {
-        /// <summary>
+    /// <summary>
-        /// Description of IAssetServer.
+    /// Description of IAssetServer.
-        /// </summary>
+    /// </summary>
-        
-        public interface IAssetServer
+    public interface IAssetServer
-        {
+    {
-                void SetReceiver(IAssetReceiver receiver);
+        void SetReceiver(IAssetReceiver receiver);
-                void RequestAsset(LLUUID assetID, bool isTexture);
+        void RequestAsset(LLUUID assetID, bool isTexture);
-                void UpdateAsset(AssetBase asset);
+        void UpdateAsset(AssetBase asset);
-                void UploadNewAsset(AssetBase asset);
+        void UploadNewAsset(AssetBase asset);
-                void SetServerInfo(string ServerUrl, string ServerKey);
+        void SetServerInfo(string ServerUrl, string ServerKey);
-        }
+        void Close();
-        
+    }
-        // could change to delegate?
-        public interface IAssetReceiver
+    // could change to delegate?
-        {
+    public interface IAssetReceiver
-                void AssetReceived(AssetBase asset, bool IsTexture);
+    {
-                void AssetNotFound(AssetBase asset);
+        void AssetReceived(AssetBase asset, bool IsTexture);
-        }
+        void AssetNotFound(AssetBase asset);
-        
+    }
-        public struct ARequest
-        {
+    public interface IAssetPlugin
-                public LLUUID AssetID;
+    {
-                public bool IsTexture;
+        IAssetServer GetAssetServer();
-        }
+    }
-        
-        public class AssetBase
+    public struct ARequest
-        {
+    {
-                public byte[] Data;
+        public LLUUID AssetID;
-                public LLUUID FullID;
+        public bool IsTexture;
-                public sbyte Type;
+    }
-                public sbyte InvType;
-                public string Name;
-                public string Description;
-                
-                public AssetBase()
-                {
-                        
-                }
-        }
-        
-        public interface IAssetPlugin
-        {
-                IAssetServer GetAssetServer();
-        }
 }
diff --git a/src/Config.cs b/OpenSim.Framework/IConfig.cs
index 1c0a6cc..ca7f645 100644
--- a/src/Config.cs
+++ b/OpenSim.Framework/IConfig.cs
@@ -31,49 +31,48 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using libsecondlife;
-using OpenSim.world;
+//using OpenSim.world;
-namespace OpenSim
+namespace OpenSim.Framework.Interfaces
 {
-        /// <summary>
+    /// <summary>
-        /// This class handles connection to the underlying database used for configuration of the region.
+    /// This class handles connection to the underlying database used for configuration of the region.
-        /// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
+    /// Region content is also stored by this class. The main entry point is InitConfig() which attempts to locate
-        /// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
+    /// opensim.yap in the current working directory. If opensim.yap can not be found, default settings are loaded from
-        /// what is hardcoded here and then saved into opensim.yap for future startups.
+    /// what is hardcoded here and then saved into opensim.yap for future startups.
-        /// </summary>
+    /// </summary>
-        
-        
-        public abstract class SimConfig
+    public abstract class SimConfig
-        {
+    {
-                public string RegionName;
+        public string RegionName;
-                
-                public uint RegionLocX;
+        public uint RegionLocX;
-                public uint RegionLocY;
+        public uint RegionLocY;
-                public ulong RegionHandle;
+        public ulong RegionHandle;
-                
-                public int IPListenPort;
+        public int IPListenPort;
-                public string IPListenAddr;
+        public string IPListenAddr;
-                
        public string AssetURL;
-            public string AssetSendKey;
+        public string AssetSendKey;
-                
-            public string GridURL;
+        public string GridURL;
-            public string GridSendKey;
+        public string GridSendKey;
-            public string GridRecvKey;
+        public string GridRecvKey;
-            public string UserURL;
+        public string UserURL;
-            public string UserSendKey;
+        public string UserSendKey;
-            public string UserRecvKey;
+        public string UserRecvKey;
+        public abstract void InitConfig(bool sandboxMode);
+        public abstract void LoadFromGrid(); 
+        public abstract float[] LoadWorld();
+        public abstract void SaveMap(float[] heightmap);
+    }
-        
+    public interface ISimConfig
-            public abstract void InitConfig();
+    {
-            public abstract void LoadFromGrid();
+        SimConfig GetConfigObject();
-            public abstract World LoadWorld();
+    }
-            public abstract void SaveMap();
-                
-        }
-        
-        public interface ISimConfig
-        {
-                SimConfig GetConfigObject();
-        }
 }
diff --git a/src/GridInterfaces/ILocalStorage.cs b/OpenSim.Framework/IGridServer.cs
index 6b7ded6..026dfab 100644
--- a/src/GridInterfaces/ILocalStorage.cs
+++ b/OpenSim.Framework/IGridServer.cs
@@ -25,62 +25,54 @@
 * 
 */
 using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
 using libsecondlife;
+using OpenSim;
-namespace GridInterfaces
+namespace OpenSim.Framework.Interfaces
 {
-        /// <summary>
+    /// <summary>
-        /// ILocalStorage. Really hacked together right now needs cleaning up
+    /// Handles connection to Grid Servers.
-        /// </summary>
+    /// also Sim to Sim connections?
-        public interface ILocalStorage
+    /// </summary>
-        {
-                void StorePrim(PrimData prim);
+    public interface IGridServer
-                void RemovePrim(LLUUID primID);
+    {
-                void LoadPrimitives(ILocalStorageReceiver receiver);
+        UUIDBlock RequestUUIDBlock();
-                void ShutDown();
+        NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions
-        }
+        AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        
+        bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-        public interface ILocalStorageReceiver
+        string GetName();
-        {
+        bool RequestConnection();
-                void PrimFromStorage(PrimData prim);
+        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
-        }
+        void Close();
-        
+    }
-        
+    
-        public class PrimData
+    public struct UUIDBlock
-        {
+    {
-                public LLUUID OwnerID;
+        public LLUUID BlockStart;
-                public byte PCode;
+        public LLUUID BlockEnd;
-                public byte PathBegin;
+    }
-                public byte PathEnd;
-                public byte PathScaleX;
+    public class AuthenticateResponse
-                public byte PathScaleY;
+    {
-                public byte PathShearX;
+        public bool Authorised;
-                public byte PathShearY;
+        public Login LoginInfo;
-                public sbyte PathSkew;
-                public byte ProfileBegin;
+        public AuthenticateResponse()
-                public byte ProfileEnd;
+        {
-                public LLVector3 Scale;
-                public byte PathCurve;
+        }
-                public byte ProfileCurve;
-                public uint ParentID=0;
+    }
-                public byte ProfileHollow;
-                public sbyte PathRadiusOffset;
+    public interface IGridPlugin
-        public byte PathRevolutions;
+    {
-        public sbyte PathTaperX;
+        IGridServer GetGridServer();
-        public sbyte PathTaperY;
+    }
-        public sbyte PathTwist;
-        public sbyte PathTwistBegin;
-        
-        //following only used during prim storage
-        public LLVector3 Position;
-                public LLQuaternion Rotation;
-                public uint LocalID;
-                public LLUUID FullID;
-                
-                public PrimData()
-                {
-                        
-                }
-        }
 }
diff --git a/src/OpenSim.Framework/LoginService.cs b/OpenSim.Framework/LoginService.cs
index 85fe761..eba0281 100644
--- a/src/OpenSim.Framework/LoginService.cs
+++ b/OpenSim.Framework/LoginService.cs
@@ -3,13 +3,12 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using Nwc.XmlRpc;
-using OpenSim.GridServers;
 using libsecondlife;
-namespace OpenSim.Framework
+namespace OpenSim.Framework.Grid
 {
    public abstract class LoginService
    {
    }
-}
+}
+\ No newline at end of file
diff --git a/src/Properties/AssemblyInfo.cs b/OpenSim.Framework/Properties/AssemblyInfo.cs
index 90fc127..86f5cdb 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/OpenSim.Framework/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("opensim")]
+[assembly: AssemblyTitle("OpenSim.FrameWork")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Playahead AB")]
+[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("opensim")]
+[assembly: AssemblyProduct("OpenSim.FrameWork")]
-[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1d09756b-a461-4302-b6fe-15c455317909")]
+[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]
 // Version information for an assembly consists of the following four values:
 //
diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index bd377d3..d70e989 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -27,10 +27,14 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using OpenSim.GridServers;
+using System.IO;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Assets;
 using libsecondlife;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
-namespace LocalGridServers
+namespace OpenSim.GridInterfaces.Local
 {
        /// <summary>
        /// 
@@ -49,86 +53,26 @@ namespace LocalGridServers
                }
        }
        
-        public class LocalAssetPlugin : IAssetPlugin
-        {
-                public LocalAssetPlugin()
-                {
-                        
-                }
-                
-                public IAssetServer GetAssetServer()
-                {
-                        return(new LocalAssetServer());
-                }
-        }
-        
-        public class LocalAssetServer : IAssetServer
-        {
-                private IAssetReceiver _receiver;
-                private BlockingQueue<ARequest> _assetRequests;
-                
-                public LocalAssetServer()
-                {
-                        this._assetRequests = new BlockingQueue<ARequest>();
-                        ServerConsole.MainConsole.Instance.WriteLine("Local Asset Server class created");
-                }
-                
-                public void SetReceiver(IAssetReceiver receiver)
-                {
-                        this._receiver = receiver;
-                }
-                
-                public void RequestAsset(LLUUID assetID, bool isTexture)
-                {
-                        ARequest req = new ARequest();
-                        req.AssetID = assetID;
-                        req.IsTexture = isTexture;
-                        //this._assetRequests.Enqueue(req);
-                }
-                
-                public void UpdateAsset(AssetBase asset)
-                {
-                        
-                }
-                
-                public void UploadNewAsset(AssetBase asset)
-                {
-                        
-                }
-                
-                public void SetServerInfo(string ServerUrl, string SendKey)
-                {
-                        
-                }
-                
-                private void RunRequests()
-                {
-                        while(true)
-                        {
-                                Thread.Sleep(1000);     
-                        }
-                }
-        }
-        
        public class LocalGridServer : LocalGridBase
        {
                public List<Login> Sessions = new List<Login>();  
-        
+                
                public LocalGridServer()
                {
                        Sessions = new List<Login>();
-                        ServerConsole.MainConsole.Instance.WriteLine("Local Grid Server class created");
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created");
-                }
-                
-                public override string GetName()
-                {
-                        return "Local";
                }
                
                public override bool RequestConnection()
                {
                        return true;
                }
+        public override string GetName()
+        {
+            return "Local";
+        }
                public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
                {
                        //we are running local
@@ -159,17 +103,22 @@ namespace LocalGridServers
                        UUIDBlock uuidBlock = new UUIDBlock();
                        return(uuidBlock);
                }
-                
-                public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
+        public override NeighbourInfo[] RequestNeighbours()
                {
-                        return new neighbourinfo[8];
+                        return null;
                }
-                
-                public override void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey)
+        public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)
                {
                        
                }
                
+                public override void Close()
+                {
+                        
+                }
                /// <summary>
                /// used by the local login server to inform us of new sessions
                /// </summary>
@@ -182,30 +131,26 @@ namespace LocalGridServers
                        }
                }
        }
-        
-        public class BlockingQueue< T > {
-                private Queue< T > _queue = new Queue< T >();
-                private object _queueSync = new object();
-                public void Enqueue(T value)
+        public class AssetUUIDQuery : Predicate
+        {
+                private LLUUID _findID;
+                
+                public AssetUUIDQuery(LLUUID find)
                {
-                        lock(_queueSync)
+                        _findID = find;
-                        {
-                                _queue.Enqueue(value);
-                                Monitor.Pulse(_queueSync);
-                        }
                }
+                public bool Match(AssetStorage asset)
-                public T Dequeue()
                {
-                        lock(_queueSync)
+                        return (asset.UUID == _findID);
-                        {
-                                if( _queue.Count < 1)
-                                        Monitor.Wait(_queueSync);
-                                return _queue.Dequeue();
-                        }
                }
        }
+        
+        public class AssetStorage
+        {
+                public byte[] Data;
+                public sbyte Type;
+                public string Name;
+                public LLUUID UUID;
+        }
 }
diff --git a/src/physics/plugins/PhysXplugin.cs b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 8c09dc8..deff803 100644
--- a/src/physics/plugins/PhysXplugin.cs
+++ b/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -26,18 +26,18 @@
 */
 using System;
 using System.Collections.Generic;
-using PhysicsSystem;
+using OpenSim.Physics.Manager;
-namespace PhysXplugin
+namespace OpenSim.Physics.BasicPhysicsPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine
        /// </summary>
-        public class PhysXPlugin : IPhysicsPlugin
+        public class BasicPhysicsPlugin : IPhysicsPlugin
        {
-                private PhysXScene _mScene;
+                private BasicScene _mScene;
                
-                public PhysXPlugin()
+                public BasicPhysicsPlugin()
                {
                        
                }
@@ -51,14 +51,14 @@ namespace PhysXplugin
                {
                        if(_mScene == null)
                        {
-                                _mScene = new PhysXScene();
+                                _mScene = new BasicScene();
                        }
                        return(_mScene);
                }
                
                public string GetName()
                {
-                        return("PhysX");
+                        return("basicphysics");
                }
                
                public void Dispose()
@@ -67,19 +67,19 @@ namespace PhysXplugin
                }
        }
        
-        public class PhysXScene :PhysicsScene
+        public class BasicScene :PhysicsScene
        {
-                private List<PhysXActor> _actors = new List<PhysXActor>();
+                private List<BasicActor> _actors = new List<BasicActor>();
                private float[] _heightMap;
                
-                public PhysXScene()
+                public BasicScene()
                {
                        
                }
                
                public override PhysicsActor AddAvatar(PhysicsVector position)
                {
-                        PhysXActor act = new PhysXActor();
+                        BasicActor act = new BasicActor();
                        act.Position = position;
                        _actors.Add(act);
                        return act;
@@ -92,7 +92,7 @@ namespace PhysXplugin
                
                public override void Simulate(float timeStep)
                {
-                        foreach (PhysXActor actor in _actors)
+                        foreach (BasicActor actor in _actors)
                        {
                                actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);
                                actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);
@@ -151,13 +151,13 @@ namespace PhysXplugin
                }
        }
        
-        public  class PhysXActor : PhysicsActor
+        public  class BasicActor : PhysicsActor
        {
                private PhysicsVector _position;
                private PhysicsVector _velocity;
                private PhysicsVector _acceleration;
                private bool flying;
-                public PhysXActor()
+                public BasicActor()
                {
                        _velocity = new PhysicsVector();
                        _position = new PhysicsVector();
@@ -200,6 +200,18 @@ namespace PhysXplugin
                        }
                }
                
+                public override Axiom.MathLib.Quaternion Orientation
+                {
+                        get
+                        {
+                                return Axiom.MathLib.Quaternion.Identity;
+                        }
+                        set
+                        {
+                                
+                        }
+                }
+                
                public override PhysicsVector Acceleration
                {
                        get
@@ -208,6 +220,18 @@ namespace PhysXplugin
                        }
                        
                }
+                
+                public override bool Kinematic
+                {
+                        get
+                        {
+                                return true;
+                        }
+                        set
+                        {
+                                
+                        }
+                }
                public void SetAcceleration (PhysicsVector accel)
                {
                        this._acceleration = accel;
diff --git a/src/physics/RealPhysX/RealPhysXplugin/AssemblyInfo.cs b/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/src/physics/RealPhysX/RealPhysXplugin/AssemblyInfo.cs
+++ b/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/src/physics/RealPhysX/RealPhysXplugin/RealPhysX.cs b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
index 9576a40..043c2f1 100644
--- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysX.cs
+++ b/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
@@ -52,10 +52,10 @@
 */
 using System;
 using System.Collections.Generic;
-using PhysicsSystem;
+using OpenSim.Physics.Manager;
 using PhysXWrapper;
-namespace PhysXplugin
+namespace OpenSim.Physics.PhysXPlugin
 {
        /// <summary>
        /// Will be the PhysX plugin but for now will be a very basic physics engine
@@ -105,6 +105,7 @@ namespace PhysXplugin
                public PhysXScene()
                {
                        mySdk = NxPhysicsSDK.CreateSDK();
+                        Console.WriteLine("Sdk created - now creating scene");
                        scene = mySdk.CreateScene();
                
                }
@@ -179,6 +180,7 @@ namespace PhysXplugin
                private PhysicsVector _acceleration;
                private NxCharacter _character;
                private bool flying;
+                private float gravityAccel;
                
                public PhysXCharacter(NxCharacter character)
                {
@@ -224,6 +226,30 @@ namespace PhysXplugin
                        }
                }
                
+                public override bool Kinematic
+                {
+                        get
+                        {
+                                return false;
+                        }
+                        set
+                        {
+                                
+                        }
+                }
+                
+                public override Axiom.MathLib.Quaternion Orientation
+                {
+                        get
+                        {
+                                return Axiom.MathLib.Quaternion.Identity;
+                        }
+                        set
+                        {
+                                
+                        }
+                }
+                
                public override PhysicsVector Acceleration
                {
                        get
@@ -258,9 +284,14 @@ namespace PhysXplugin
                        }
                        else
                        {
-                                vec.Z = (-9.8f + this._velocity.Z) * timeStep;
+                                gravityAccel+= -9.8f;
+                                vec.Z = (gravityAccel + this._velocity.Z) * timeStep;
+                        }
+                        int res = this._character.Move(vec);
+                        if(res == 1)
+                        {
+                                gravityAccel = 0;
                        }
-                        this._character.Move(vec);
                }
                
                public void UpdatePosition()
@@ -332,6 +363,36 @@ namespace PhysXplugin
                        }
                }
                
+                public override bool Kinematic
+                {
+                        get
+                        {
+                                return this._prim.Kinematic;
+                        }
+                        set
+                        {
+                                this._prim.Kinematic = value;
+                        }
+                }
+                
+                public override Axiom.MathLib.Quaternion Orientation
+                {
+                        get
+                        {
+                                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+                                PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
+                                res.w = quat.W;
+                                res.x = quat.X;
+                                res.y = quat.Y;
+                                res.z = quat.Z;
+                                return res;
+                        }
+                        set
+                        {
+                                
+                        }
+                }
+                
                public override PhysicsVector Acceleration
                {
                        get
diff --git a/src/OpenSimConsole.cs b/OpenSim.RegionServer/SimConsole.cs
index cf8b648..d6d5e44 100644
--- a/src/OpenSimConsole.cs
+++ b/OpenSim.RegionServer/SimConsole.cs
@@ -33,14 +33,14 @@ using System.IO;
 using System.Net;
 using libsecondlife;
 using libsecondlife.Packets;
-using ServerConsole;
+using OpenSim.Framework.Console;
 namespace OpenSim
 {
        /// <summary>
        /// Description of ServerConsole.
        /// </summary>
-        public class MServerConsole : ConsoleBase
+        public class SimConsole : ConsoleBase
        {
                        
                private ConsoleType ConsType;
@@ -57,7 +57,7 @@ namespace OpenSim
                //              TCP - the port to bind to
                //              Local - param ignored
                //              SimChat - the chat channel to accept commands from
-                public MServerConsole(ConsoleType constype, string sparam, int iparam) {
+                public SimConsole(ConsoleType constype, string sparam, int iparam) {
                        ConsType = constype;
                        switch(constype) {
                                case ConsoleType.Local:
@@ -156,11 +156,11 @@ namespace OpenSim
                                break;
                                
                                case "regenerate":
-                                OpenSim_Main.local_world.RegenerateTerrain();
+                                OpenSimRoot.Instance.LocalWorld.RegenerateTerrain();
                                break;
                                
                                case "shutdown":
-                                OpenSim_Main.Shutdown();
+                                OpenSimRoot.Instance.Shutdown();
                                break;
                        }
                        return null;
@@ -170,16 +170,16 @@ namespace OpenSim
                public override void ShowCommands(string ShowWhat) {
                        switch(ShowWhat) {
                                case "uptime":
-                                        this.WriteLine("OpenSim has been running since " + OpenSim_Main.sim.startuptime.ToString());
+                                        this.WriteLine("OpenSim has been running since " + OpenSimRoot.Instance.startuptime.ToString());
-                                        this.WriteLine("That is " + (DateTime.Now-OpenSim_Main.sim.startuptime).ToString());
+                                        this.WriteLine("That is " + (DateTime.Now-OpenSimRoot.Instance.startuptime).ToString());
                                        break;
                                case "users":
                                        OpenSim.world.Avatar TempAv;
                                        this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP"));
-                                        foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) {
+                                        foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) {
-                                                if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar")
+                                                if(OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString()== "OpenSim.world.Avatar")
                                                {
-                                                        TempAv=(OpenSim.world.Avatar)OpenSim_Main.local_world.Entities[UUID];
+                                                        TempAv=(OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
                                                        this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}",TempAv.firstname, TempAv.lastname,UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
                                                }
                                        }
@@ -190,7 +190,7 @@ namespace OpenSim
                // Displays a prompt to the user and then runs the command they entered
                public override void MainConsolePrompt() {
                        string[] tempstrarray;
-                        string tempstr = this.CmdPrompt("OpenSim-" + OpenSim_Main.cfg.RegionHandle.ToString() + " # ");
+                        string tempstr = this.CmdPrompt("OpenSim-" + OpenSimRoot.Instance.Cfg.RegionHandle.ToString() + " # ");
                        tempstrarray = tempstr.Split(' ');
                        string cmd=tempstrarray[0];
                        Array.Reverse(tempstrarray);
diff --git a/src/VersionInfo.cs b/OpenSim.RegionServer/VersionInfo.cs
index 5cfd136..39767df 100644
--- a/src/VersionInfo.cs
+++ b/OpenSim.RegionServer/VersionInfo.cs
@@ -28,10 +28,10 @@ using System;
 namespace OpenSim
 {
-        /// <summary>
+    /// <summary>
-        /// </summary>
+    /// </summary>
-        public class VersionInfo
+    public class VersionInfo
-        {
+    {
-                public static string Version = "0.1, Build 1174381410, Revision 240M"; 
+        public static string Version = "0.1, Build 1173843165, Revision 193:206M";
-        }
+    }
 }
diff --git a/src/types/Mesh.cs b/OpenSim.RegionServer/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/src/types/Mesh.cs
+++ b/OpenSim.RegionServer/types/Mesh.cs
diff --git a/src/types/Triangle.cs b/OpenSim.RegionServer/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/src/types/Triangle.cs
+++ b/OpenSim.RegionServer/types/Triangle.cs
diff --git a/src/world/Entity.cs b/OpenSim.RegionServer/world/Entity.cs
index ee4b2e4..780f3a0 100644
--- a/src/world/Entity.cs
+++ b/OpenSim.RegionServer/world/Entity.cs
@@ -20,7 +20,7 @@ namespace OpenSim.world
        public Entity()
        {
            uuid = new libsecondlife.LLUUID();
-            localid = 8880000 + (OpenSim_Main.local_world._localNumber++); // FIXME - race condition!
+            localid = 0;
            position = new LLVector3();
            velocity = new LLVector3();
            rotation = new Quaternion();
diff --git a/src/world/ScriptEngine.cs b/OpenSim.RegionServer/world/ScriptEngine.cs
index f20a08e..f20a08e 100644
--- a/src/world/ScriptEngine.cs
+++ b/OpenSim.RegionServer/world/ScriptEngine.cs
diff --git a/src/world/SurfacePatch.cs b/OpenSim.RegionServer/world/SurfacePatch.cs
index 71e4116..71e4116 100644
--- a/src/world/SurfacePatch.cs
+++ b/OpenSim.RegionServer/world/SurfacePatch.cs
diff --git a/src/world/World.cs b/OpenSim.RegionServer/world/World.cs
index e1c84bc..ba99233 100644
--- a/src/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -5,8 +5,10 @@ using System.Collections.Generic;
 using System.Text;
 using System.Reflection;
 using System.IO;
-using PhysicsSystem;
+using OpenSim.Physics.Manager;
-using GridInterfaces;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Assets;
+using OpenSim.Framework.Terrain;
 namespace OpenSim.world
 {
@@ -26,10 +28,10 @@ namespace OpenSim.world
        public World()
        {
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
                TerrainManager = new TerrainManager(new SecondLife());
                Avatar.SetupTemplate("avatar-template.dat");
        //      ServerConsole.MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
@@ -71,7 +73,7 @@ namespace OpenSim.world
                
                //backup world data
                this.storageCount++;
-                        if(storageCount> 300) //set to how often you want to backup 
+                        if(storageCount> 1200) //set to how often you want to backup 
                        {
                                this.Backup();
                                storageCount =0;
@@ -112,15 +114,15 @@ namespace OpenSim.world
                HeightmapGenHills hills = new HeightmapGenHills();
                this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
                this.phyScene.SetTerrain(this.LandMap);
-                OpenSim_Main.cfg.SaveMap();
+                OpenSimRoot.Instance.Cfg.SaveMap(this.LandMap);
                
-                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
+                foreach(SimClient client in OpenSimRoot.Instance.ClientThreads.Values) {
                        this.SendLayerData(client);
                }
        }
        public void LoadPrimsFromStorage()
        {
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
                this.localStorage.LoadPrimitives(this);
        }
        
@@ -130,7 +132,7 @@ namespace OpenSim.world
                {
                        _primCount = prim.LocalID + 1;
                }
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");
                Primitive nPrim = new Primitive();
                nPrim.CreateFromStorage(prim);
                this.Entities.Add(nPrim.uuid, nPrim);
@@ -141,7 +143,7 @@ namespace OpenSim.world
                this.localStorage.ShutDown();
        }
        
-        public void SendLayerData(OpenSimClient RemoteClient) {
+        public void SendLayerData(SimClient RemoteClient) {
                int[] patches = new int[4];
                for (int y = 0; y < 16; y++)
@@ -159,7 +161,7 @@ namespace OpenSim.world
                }
        }
        
-        public void GetInitialPrims(OpenSimClient RemoteClient)
+        public void GetInitialPrims(SimClient RemoteClient)
        {
                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
                {
@@ -170,33 +172,36 @@ namespace OpenSim.world
                }
        }
-        public void AddViewerAgent(OpenSimClient AgentClient) {
+        public void AddViewerAgent(SimClient AgentClient) {
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
                Avatar NewAvatar = new Avatar(AgentClient);
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
                NewAvatar.SendRegionHandshake(this);
                PhysicsVector pVec = new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z);
                NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
                this.Entities.Add(AgentClient.AgentID, NewAvatar);
        }
        
-        public void AddNewPrim(ObjectAddPacket addPacket, OpenSimClient AgentClient)
+        public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)
        {
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
                Primitive prim = new Primitive();
                prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);
                PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z);
-                PhysicsVector pSize = new PhysicsVector( 0.25f, 0.25f, 0.25f);
+                PhysicsVector pSize = new PhysicsVector( 0.255f, 0.255f, 0.255f);
-                //prim.PhysActor = this.phyScene.AddPrim(pVec, pSize );
+                if(OpenSim.world.Avatar.PhysicsEngineFlying)
+                {
+                        prim.PhysActor = this.phyScene.AddPrim(pVec, pSize );
+                }
                //prim.PhysicsEnabled = true;
                this.Entities.Add(prim.uuid, prim);
                this._primCount++;
        }
        public bool Backup() {
-                /* TODO: Save the current world entities state. */
+        
-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");
                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
                {
                        Entities[UUID].BackUp();
diff --git a/src/world/scripting/IScript.cs b/OpenSim.RegionServer/world/scripting/IScript.cs
index 550594d..550594d 100644
--- a/src/world/scripting/IScript.cs
+++ b/OpenSim.RegionServer/world/scripting/IScript.cs
diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index bb9825c..93ed9cc 100644
--- a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -29,9 +29,10 @@ using System.Collections.Generic;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using libsecondlife;
-using GridInterfaces;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Assets;
-namespace Db4LocalStorage
+namespace OpenSim.Storage.LocalStorageDb4o
 {
        /// <summary>
        /// 
@@ -45,13 +46,13 @@ namespace Db4LocalStorage
                        try 
                        {
                                db = Db4oFactory.OpenFile("localworld.yap");
-                                ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage creation");
+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage creation");
                        }
                        catch(Exception e) 
                        {
                                db.Close();
-                                ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");
+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");
-                                ServerConsole.MainConsole.Instance.WriteLine(e.ToString());
+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
                        }
                }
                
@@ -84,6 +85,7 @@ namespace Db4LocalStorage
                                found.ProfileHollow = prim.ProfileHollow;
                                found.Position = prim.Position;
                                found.Rotation = prim.Rotation;
+                found.Texture = prim.Texture;
                                db.Set(found);
                                db.Commit();
                        }
@@ -109,7 +111,7 @@ namespace Db4LocalStorage
                public void LoadPrimitives(ILocalStorageReceiver receiver)
                {
                        IObjectSet result = db.Get(typeof(PrimData));
-                        ServerConsole.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
                        foreach (PrimData prim in result) {
                                receiver.PrimFromStorage(prim);
                        }
@@ -121,19 +123,4 @@ namespace Db4LocalStorage
                        db.Close();
                }
        }
-        
-        public class UUIDQuery : Predicate
-        {
-                private LLUUID _findID;
-                
-                public UUIDQuery(LLUUID find)
-                {
-                        _findID = find;
-                }
-                public bool Match(PrimData prim)
-                {
-                        return (prim.FullID == _findID);
-                }
-        }
-        
 }
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
deleted file mode 100644
index b88eb75..0000000
--- a/src/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.0.0.1")]
-[assembly: AssemblyTitleAttribute("opensim")]
-[assembly: AssemblyDescriptionAttribute("The C# implementation of the simulator portion of OGS")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/Assets/AssetCache.cs b/src/Assets/AssetCache.cs
deleted file mode 100644
index d35b482..0000000
--- a/src/Assets/AssetCache.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim;
-using OpenSim.GridServers;
-namespace OpenSim.Assets
-{
-        /// <summary>
-        /// Manages local cache of assets and their sending to viewers.
-        /// </summary>
-        public class AssetCache : IAssetReceiver
-        {
-                public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets;
-                public Dictionary<libsecondlife.LLUUID, TextureImage> Textures;
-                
-                public List<AssetRequest> AssetRequests = new List<AssetRequest>();  //assets ready to be sent to viewers
-                public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
-                
-                public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); //Assets requested from the asset server
-                public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); //Textures requested from the asset server
-                
-                private IAssetServer _assetServer;
-                private Thread _assetCacheThread;
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                public AssetCache( IAssetServer assetServer)
-                {
-                        _assetServer = assetServer;
-                        _assetServer.SetReceiver(this);
-                        Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo> ();
-                        Textures = new Dictionary<libsecondlife.LLUUID, TextureImage> ();
-                        this._assetCacheThread = new Thread( new ThreadStart(RunAssetManager));
-                        this._assetCacheThread.IsBackground = true;
-                        this._assetCacheThread.Start();
-                }
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                private void RunAssetManager()
-                {
-                        this.ProcessAssetQueue();
-                        this.ProcessTextureQueue();
-                        Thread.Sleep(100);
-                }
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                private void ProcessTextureQueue()
-                {
-                        if(this.TextureRequests.Count == 0)
-                        {
-                                //no requests waiting
-                                return;
-                        }
-                        int num;
-                        
-                        if(this.TextureRequests.Count < 5)
-                        {
-                                //lower than 5 so do all of them
-                                num = this.TextureRequests.Count;
-                        }
-                        else
-                        {
-                                num=5;
-                        }
-                        AssetRequest req;
-                        for(int i = 0; i < num; i++)
-                        {
-                                req=(AssetRequest)this.TextureRequests[i];
-                                
-                                if(req.PacketCounter == 0)
-                                {
-                                        //first time for this request so send imagedata packet
-                                        if(req.NumPackets == 1)
-                                        {
-                                                //only one packet so send whole file
-                                                ImageDataPacket im = new ImageDataPacket();
-                                                im.ImageID.Packets = 1;
-                                                im.ImageID.ID = req.ImageInfo.FullID;
-                                                im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
-                                                im.ImageData.Data = req.ImageInfo.Data;
-                                                im.ImageID.Codec = 2;
-                                                req.RequestUser.OutPacket(im);
-                                                req.PacketCounter++;
-                                                //req.ImageInfo.l= time;
-                                                //System.Console.WriteLine("sent texture: "+req.image_info.FullID);
-                                        }
-                                        else
-                                        {
-                                                //more than one packet so split file up
-                                                ImageDataPacket im = new ImageDataPacket();
-                                                im.ImageID.Packets = (ushort)req.NumPackets;
-                                                im.ImageID.ID = req.ImageInfo.FullID;
-                                                im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
-                                                im.ImageData.Data = new byte[600];
-                                                Array.Copy(req.ImageInfo.Data, 0, im.ImageData.Data, 0, 600);
-                                                im.ImageID.Codec = 2;
-                                                req.RequestUser.OutPacket(im);
-                                                req.PacketCounter++;
-                                                //req.ImageInfo.last_used = time;
-                                                //System.Console.WriteLine("sent first packet of texture:
-                                        }
-                                }
-                                else
-                                {
-                                        //send imagepacket
-                                        //more than one packet so split file up
-                                        ImagePacketPacket im = new ImagePacketPacket();
-                                        im.ImageID.Packet = (ushort)req.PacketCounter;
-                                        im.ImageID.ID = req.ImageInfo.FullID;
-                                        int size = req.ImageInfo.Data.Length - 600 - 1000*(req.PacketCounter - 1);
-                                        if(size > 1000) size = 1000;
-                                        im.ImageData.Data = new byte[size];
-                                        Array.Copy(req.ImageInfo.Data, 600 + 1000*(req.PacketCounter - 1), im.ImageData.Data, 0, size);
-                                        req.RequestUser.OutPacket(im);
-                                        req.PacketCounter++;
-                                        //req.ImageInfo.last_used = time;
-                                        //System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID);
-                                }
-                        }
-                        
-                        //remove requests that have been completed
-                        int count = 0;
-                        for(int i = 0; i < num; i++)
-                        {
-                                req=(AssetRequest)this.TextureRequests[count];
-                                if(req.PacketCounter == req.NumPackets)
-                                {
-                                        this.TextureRequests.Remove(req);
-                                }
-                                else
-                                {
-                                        count++;
-                                }
-                        }
-                        
-                }
-                public void AssetReceived(AssetBase asset, bool IsTexture)
-                {
-                        //check if it is a texture or not
-                        //then add to the correct cache list
-                        //then check for waiting requests for this asset/texture (in the Requested lists)
-                        //and move those requests into the Requests list.
-                        if(IsTexture)
-                        {
-                                TextureImage image = new TextureImage(asset);
-                                this.Textures.Add(image.FullID, image);
-                                if(this.RequestedTextures.ContainsKey(image.FullID))
-                                {
-                                        AssetRequest req = this.RequestedTextures[image.FullID];
-                                        req.ImageInfo = image;
-                                        this.RequestedTextures.Remove(image.FullID);
-                                        this.TextureRequests.Add(req);
-                                }
-                        }
-                        else
-                        {
-                                AssetInfo assetInf = new AssetInfo(asset);
-                                this.Assets.Add(assetInf.FullID, assetInf);
-                                if(this.RequestedAssets.ContainsKey(assetInf.FullID))
-                                {
-                                        AssetRequest req = this.RequestedAssets[assetInf.FullID];
-                                        req.AssetInf = assetInf;
-                                        this.RequestedAssets.Remove(assetInf.FullID);
-                                        this.AssetRequests.Add(req);
-                                }
-                        }
-                }
-                
-                public void AssetNotFound(AssetBase asset)
-                {
-                        //the asset server had no knowledge of requested asset
-                        
-                }
-                
-                #region Assets
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="userInfo"></param>
-                /// <param name="transferRequest"></param>
-                public void AddAssetRequest(OpenSimClient userInfo, TransferRequestPacket transferRequest)
-                {
-                        LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
-                        //check to see if asset is in local cache, if not we need to request it from asset server.
-                        if(!this.Assets.ContainsKey(requestID))
-                        {
-                                //not found asset       
-                                // so request from asset server
-                                AssetRequest request = new AssetRequest();
-                                request.RequestUser = userInfo;
-                                request.RequestAssetID = requestID;
-                                request.TransferRequestID = transferRequest.TransferInfo.TransferID;
-                                this.RequestedAssets.Add(requestID,request);
-                                this._assetServer.RequestAsset(requestID, false);
-                                return;
-                        }
-                        //it is in our cache 
-                        AssetInfo asset = this.Assets[requestID];
-                        
-                        //work out how many packets it  should be sent in 
-                        // and add to the AssetRequests list
-                        AssetRequest req = new AssetRequest();
-                        req.RequestUser = userInfo;
-                        req.RequestAssetID = requestID;
-                        req.TransferRequestID = transferRequest.TransferInfo.TransferID;
-                        req.AssetInf = asset;
-                        
-                        if(asset.Data.LongLength>600) 
-                        {
-                                //over 600 bytes so split up file
-                                req.NumPackets = 1 + (int)(asset.Data.Length-600+999)/1000;
-                        }
-                        else
-                        {
-                                req.NumPackets = 1;
-                        }
-                        
-                        this.AssetRequests.Add(req);
-                }
-                
-                /// <summary>
-                /// 
-                /// </summary>
-                private void ProcessAssetQueue()
-                {
-                        if(this.AssetRequests.Count == 0)
-                        {
-                                //no requests waiting
-                                return;
-                        }
-                        int num;
-                        
-                        if(this.AssetRequests.Count < 5)
-                        {
-                                //lower than 5 so do all of them
-                                num = this.AssetRequests.Count;
-                        }
-                        else
-                        {
-                                num=5;
-                        }
-                        AssetRequest req;
-                        for(int i = 0; i < num; i++)
-                        {
-                                req=(AssetRequest)this.AssetRequests[i];
-                                
-                                TransferInfoPacket Transfer = new TransferInfoPacket();
-                                Transfer.TransferInfo.ChannelType = 2;
-                                Transfer.TransferInfo.Status = 0;
-                                Transfer.TransferInfo.TargetType = 0;
-                                Transfer.TransferInfo.Params = req.RequestAssetID.GetBytes();
-                                Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
-                                Transfer.TransferInfo.TransferID = req.TransferRequestID;
-                                req.RequestUser.OutPacket(Transfer);
-                                
-                                if(req.NumPackets == 1)
-                                {
-                                        TransferPacketPacket TransferPacket = new TransferPacketPacket();
-                                        TransferPacket.TransferData.Packet = 0;
-                                        TransferPacket.TransferData.ChannelType = 2;
-                                        TransferPacket.TransferData.TransferID=req.TransferRequestID;
-                                        TransferPacket.TransferData.Data = req.AssetInf.Data;
-                                        TransferPacket.TransferData.Status = 1;
-                                        req.RequestUser.OutPacket(TransferPacket);
-                                }
-                                else
-                                {
-                                        //more than one packet so split file up , for now it can't be bigger than 2000 bytes
-                                        TransferPacketPacket TransferPacket = new TransferPacketPacket();
-                                        TransferPacket.TransferData.Packet = 0;
-                                        TransferPacket.TransferData.ChannelType = 2;
-                                        TransferPacket.TransferData.TransferID=req.TransferRequestID;
-                                        byte[] chunk = new byte[1000];
-                                        Array.Copy(req.AssetInf.Data,chunk,1000);
-                                        TransferPacket.TransferData.Data = chunk;
-                                        TransferPacket.TransferData.Status = 0;
-                                        req.RequestUser.OutPacket(TransferPacket);      
-                                        
-                                        TransferPacket = new TransferPacketPacket();
-                                        TransferPacket.TransferData.Packet = 1;
-                                        TransferPacket.TransferData.ChannelType = 2;
-                                        TransferPacket.TransferData.TransferID = req.TransferRequestID;
-                                        byte[] chunk1 = new byte[(req.AssetInf.Data.Length-1000)];
-                                        Array.Copy(req.AssetInf.Data, 1000, chunk1, 0, chunk1.Length);
-                                        TransferPacket.TransferData.Data = chunk1;
-                                        TransferPacket.TransferData.Status = 1;
-                                        req.RequestUser.OutPacket(TransferPacket);
-                                }
-                                
-                        }
-                        
-                        //remove requests that have been completed
-                        for(int i = 0; i < num; i++)
-                        {
-                                this.AssetRequests.RemoveAt(0);
-                        }
-                        
-                }
-                
-                #endregion
-                
-                #region Textures
-                /// <summary>
-                /// 
-                /// </summary>
-                /// <param name="userInfo"></param>
-                /// <param name="imageID"></param>
-                public void AddTextureRequest(OpenSimClient userInfo, LLUUID imageID)
-                {
-                        //check to see if texture is in local cache, if not request from asset server
-                        if(!this.Textures.ContainsKey(imageID))
-                        {
-                                //not is cache so request from asset server
-                                AssetRequest request = new AssetRequest();
-                                request.RequestUser = userInfo;
-                                request.RequestAssetID = imageID;
-                                request.IsTextureRequest = true;
-                                this.RequestedTextures.Add(imageID, request);
-                                this._assetServer.RequestAsset(imageID, true);
-                                return;
-                        }
-                        TextureImage imag = this.Textures[imageID];
-                        AssetRequest req = new AssetRequest();
-                        req.RequestUser = userInfo;
-                        req.RequestAssetID = imageID;
-                        req.IsTextureRequest = true;
-                        req.ImageInfo = imag;
-                        
-                        if(imag.Data.LongLength>600) 
-                        {
-                                //over 600 bytes so split up file
-                                req.NumPackets = 1 + (int)(imag.Data.Length-600+999)/1000;
-                        }
-                        else
-                        {
-                                req.NumPackets = 1;
-                        }
-                        
-                        this.TextureRequests.Add(req);
-                }
-                #endregion
-                
-        }
-        public class AssetRequest
-        {
-                public OpenSimClient RequestUser;
-                public LLUUID RequestAssetID;
-                public AssetInfo AssetInf;
-                public TextureImage ImageInfo;
-                public LLUUID TransferRequestID;
-                public long DataPointer = 0;
-                public int NumPackets = 0;
-                public int PacketCounter = 0;
-                public bool IsTextureRequest;
-                //public bool AssetInCache;
-                //public int TimeRequested; 
-                
-                public AssetRequest()
-                {
-                        
-                }
-        }
-        
-        public class AssetInfo : AssetBase
-        {
-                public AssetInfo()
-                {
-                        
-                }
-                
-                public AssetInfo(AssetBase aBase)
-                {
-                        Data= aBase.Data;
-                        FullID = aBase.FullID;
-                        Type = aBase.Type;
-                        InvType = aBase.InvType;
-                        Name= aBase.Name;
-                        Description = aBase.Description;
-                }
-        }
-        
-        public class TextureImage : AssetBase
-        {
-                public TextureImage()
-                {
-                        
-                }
-                
-                public TextureImage(AssetBase aBase)
-                {
-                        Data= aBase.Data;
-                        FullID = aBase.FullID;
-                        Type = aBase.Type;
-                        InvType = aBase.InvType;
-                        Name= aBase.Name;
-                        Description = aBase.Description;
-                }
-        }
-}
diff --git a/src/CAPS/SimHttp.cs b/src/CAPS/SimHttp.cs
deleted file mode 100644
index c0373de..0000000
--- a/src/CAPS/SimHttp.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-Copyright (c) OpenSimCAPS project, http://osgrid.org/
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-using System;
-using System.Text;
-using Nwc.XmlRpc;
-using System.Threading;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using ServerConsole;
-using OpenSim.GridServers;
-namespace OpenSim
-{
-        // Dummy HTTP server, does nothing useful for now
-        public class SimCAPSHTTPServer {
-                public Thread HTTPD;
-                public HttpListener Listener;
-        
-                public SimCAPSHTTPServer() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
-                        HTTPD = new Thread(new ThreadStart(StartHTTP));
-                        HTTPD.Start();
-                }
-                public void StartHTTP() {
-                        try
-                        {
-                                ServerConsole.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK");
-                                Listener = new HttpListener();
-                                Listener.Prefixes.Add("http://+:" + OpenSim_Main.cfg.IPListenPort + "/");
-                                Listener.Start();
-                                HttpListenerContext context;
-                                while(true) {
-                                        context = Listener.GetContext();
-                                        ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
-                                }
-                        }
-                        catch (Exception e)
-                        {
-                                ServerConsole.MainConsole.Instance.WriteLine(e.Message);
-                        }
-                }
-                static string ParseXMLRPC(string requestBody) {
-                        try
-                        {
-                                XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
-                                
-                                Hashtable requestData = (Hashtable)request.Params[0];
-                                switch(request.MethodName) {
-                                        case "expect_user":
-                                                GridServers.agentcircuitdata agent_data = new GridServers.agentcircuitdata();
-                                                agent_data.SessionID = new LLUUID((string)requestData["session_id"]);
-                                                agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
-                                                agent_data.firstname = (string)requestData["firstname"];
-                                                agent_data.lastname = (string)requestData["lastname"];
-                                                agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
-                                                agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-                                                if (OpenSim_Main.gridServers.GridServer.GetName() == "Remote")
-                                                {
-                                                        ((RemoteGridBase) OpenSim_Main.gridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode,agent_data);
-                                                }
-                                                return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>";
-                                                break;
-                                }
-                        } 
-                        catch(Exception e) 
-                        {
-                                Console.WriteLine(e.ToString());
-                        }
-                        return "";
-                }
-                
-                static string ParseREST(string requestBody, string requestURL) {
-                        return "";
-                }
-                static string ParseLLSDXML(string requestBody) {
-                        // dummy function for now - IMPLEMENT ME!
-                        return "";
-                }
-                static void HandleRequest(Object  stateinfo) {
-                        HttpListenerContext context=(HttpListenerContext)stateinfo;
-                        
-                        HttpListenerRequest request = context.Request;
-                        HttpListenerResponse response = context.Response;
-                        response.KeepAlive=false;
-                        response.SendChunked=false;
-                        System.IO.Stream body = request.InputStream;
-                        System.Text.Encoding encoding = System.Text.Encoding.UTF8;
-                        System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
-                        
-                        string requestBody = reader.ReadToEnd();
-                        body.Close();
-                        reader.Close();
-                        string responseString="";
-                        switch(request.ContentType) {
-                                case "text/xml":
-                                        // must be XML-RPC, so pass to the XML-RPC parser
-                                        
-                                        responseString=ParseXMLRPC(requestBody);
-                                        response.AddHeader("Content-type","text/xml");
-                                        break;
-                                        
-                                case "application/xml":
-                                        // probably LLSD we hope, otherwise it should be ignored by the parser
-                                        responseString=ParseLLSDXML(requestBody);
-                                        response.AddHeader("Content-type","application/xml");
-                                        break;
-                                        
-                                case null:
-                                        // must be REST or invalid crap, so pass to the REST parser
-                                        responseString=ParseREST(request.Url.OriginalString,requestBody);
-                                        break;
-                        }
-                                
-                        byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
-                        System.IO.Stream output = response.OutputStream;
-                        response.SendChunked=false;
-                        response.ContentLength64=buffer.Length;
-                        output.Write(buffer,0,buffer.Length);
-                        output.Close();
-                }
-        }
-}
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
deleted file mode 100644
index 7fabd63..0000000
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-simconfig")]
-[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/Config/SimConfig/Db4SimConfig.cs b/src/Config/SimConfig/Db4SimConfig.cs
deleted file mode 100644
index 1b696fe..0000000
--- a/src/Config/SimConfig/Db4SimConfig.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using OpenSim;
-using OpenSim.world;
-using Db4objects.Db4o;
-namespace Db40SimConfig
-{
-        public class Db40ConfigPlugin: ISimConfig
-        {
-                public SimConfig GetConfigObject()
-                {
-                        ServerConsole.MainConsole.Instance.WriteLine("Loading Db40Config dll");
-                        return ( new DbSimConfig());
-                }
-        }
-        
-        public class DbSimConfig :SimConfig
-        {
-                private IObjectContainer db;    
-                
-                public void LoadDefaults() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
-                        
-                        this.RegionName=ServerConsole.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ","OpenSim test");
-                        this.RegionLocX=(uint)Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ","997"));
-                        this.RegionLocY=(uint)Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ","996"));
-                        this.IPListenPort=Convert.ToInt32(ServerConsole.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ","9000"));
-                        this.IPListenAddr=ServerConsole.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ","127.0.0.1");
-                        
-                        if(!OpenSim_Main.sim.sandbox)
-                        {
-                                this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: ");
-                                this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: ");
-                                this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: ");
-                                this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
-                                this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
-                                this.UserURL=ServerConsole.MainConsole.Instance.CmdPrompt("User server URL: ");
-                                this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
-                                this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
-                        }
-                        this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
-                }
-                public override void InitConfig() {
-                        try {
-                                db = Db4oFactory.OpenFile("opensim.yap");
-                                IObjectSet result = db.Get(typeof(DbSimConfig));
-                                if(result.Count==1) {
-                                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a SimConfig object in the local database, loading");
-                                        foreach (DbSimConfig cfg in result) {
-                                                this.RegionName = cfg.RegionName;
-                                                this.RegionLocX = cfg.RegionLocX;
-                                                this.RegionLocY = cfg.RegionLocY;
-                                                this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
-                                                this.IPListenPort = cfg.IPListenPort;
-                                                this.IPListenAddr = cfg.IPListenAddr;
-                                                this.AssetURL = cfg.AssetURL;
-                                                this.AssetSendKey = cfg.AssetSendKey;
-                                                this.GridURL = cfg.GridURL;
-                                                this.GridSendKey = cfg.GridSendKey;
-                                        }
-                                } else {
-                                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
-                                        LoadDefaults();
-                                        ServerConsole.MainConsole.Instance.WriteLine("Writing out default settings to local database");
-                                        db.Set(this);
-                                }
-                        } catch(Exception e) {
-                                db.Close();
-                                ServerConsole.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");
-                                ServerConsole.MainConsole.Instance.WriteLine(e.ToString());
-                        }
-                        
-                        ServerConsole.MainConsole.Instance.WriteLine("Sim settings loaded:");
-                        ServerConsole.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
-                        ServerConsole.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-                        ServerConsole.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString());
-                        ServerConsole.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
-                        ServerConsole.MainConsole.Instance.WriteLine("Sandbox Mode? " + OpenSim_Main.sim.sandbox.ToString());
-                        ServerConsole.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL);
-                        ServerConsole.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey);
-                        ServerConsole.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL);
-                        ServerConsole.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey);
-                }
-        
-                public override World LoadWorld() 
-                {
-                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Loading world....");
-                        World blank = new World();
-                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Looking for a heightmap in local DB");
-                        IObjectSet world_result = db.Get(typeof(MapStorage));
-                        if(world_result.Count>0) {
-                                ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Found a heightmap in local database, loading");
-                                MapStorage map=(MapStorage)world_result.Next(); 
-                                blank.LandMap = map.Map;
-                        } else {
-                                ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - No heightmap found, generating new one");
-                                HeightmapGenHills hills = new HeightmapGenHills();
-                blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
-                                ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Saving heightmap to local database");
-                                MapStorage map= new MapStorage();
-                                map.Map = blank.LandMap;
-                                db.Set(map);
-                                db.Commit();
-                        }
-                        return blank;
-                }
-                
-                public override void SaveMap()
-                {
-                        IObjectSet world_result = db.Get(typeof(MapStorage));
-                        if(world_result.Count>0) {
-                                ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - updating saved copy of heightmap in local database");
-                                MapStorage map=(MapStorage)world_result.Next();
-                                db.Delete(map);
-                        }
-                        MapStorage map1= new MapStorage();
-                        map1.Map = OpenSim_Main.local_world.LandMap;
-                        db.Set(map1);
-                        db.Commit();
-                }
-                public override void LoadFromGrid() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Config.cs:LoadFromGrid() - dummy function, DOING ABSOLUTELY NOTHING AT ALL!!!");
-                        // TODO: Make this crap work
-                        /* WebRequest GridLogin = WebRequest.Create(this.GridURL + "regions/" + this.RegionHandle.ToString() + "/login");
-                        WebResponse GridResponse = GridLogin.GetResponse();
-                        byte[] idata = new byte[(int)GridResponse.ContentLength];
-                        BinaryReader br = new BinaryReader(GridResponse.GetResponseStream());
-                        
-                        br.Close();
-                        GridResponse.Close();
-                        */                                                                                  
-                }
-                public void Shutdown() {
-                        db.Close();
-                }
-        }
-        
-        public class MapStorage
-        {
-                public float[] Map;
-                
-                public MapStorage()
-                {
-                        
-                }
-        }
-}
diff --git a/src/Config/SimConfig/SimConfig.csproj b/src/Config/SimConfig/SimConfig.csproj
deleted file mode 100644
index 43e9499..0000000
--- a/src/Config/SimConfig/SimConfig.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SimConfig</RootNamespace>
-    <AssemblyName>SimConfig</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B063760D-DB8D-4F64-B6FE-335FAD1E650A}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Db4objects.Db4o">
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Db4SimConfig.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Second-server.csproj">
-      <Project>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</Project>
-      <Name>Second-server</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/Config/default.build b/src/Config/default.build
deleted file mode 100644
index 9e13ca6..0000000
--- a/src/Config/default.build
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../bin/SimConfig.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="SimConfig/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-simconfig" />
-                        <attribute type="AssemblyDescriptionAttribute" value="The default configuration handler" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/SimConfig.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin/" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Data.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="ServerConsole.dll" />
-                                <include name="GridInterfaces.dll" />
-                                <include name="OpenSim.exe" />
-                                <include name="Db4objects.Db4o.dll" />
-                        </references>
-                        <sources basedir="SimConfig/">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
deleted file mode 100644
index 32f1380..0000000
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
-[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/GridInterfaces/GridInterfaces.csproj b/src/GridInterfaces/GridInterfaces.csproj
deleted file mode 100644
index 197994f..0000000
--- a/src/GridInterfaces/GridInterfaces.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GridInterfaces</RootNamespace>
-    <AssemblyName>GridInterfaces</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="libsecondlife">
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IAssetServer.cs" />
-    <Compile Include="IGridServer.cs" />
-    <Compile Include="ILocalStorage.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
deleted file mode 100644
index dcb8ef2..0000000
--- a/src/GridInterfaces/IGridServer.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using libsecondlife;
-using OpenSim;
-namespace OpenSim.GridServers
-{
-        /// <summary>
-        /// Handles connection to Grid Servers.
-        /// also Sim to Sim connections?
-        /// </summary>
-        
-        
-        
-        
-        public interface IGridServer
-        {
-                UUIDBlock RequestUUIDBlock();
-                neighbourinfo[] RequestNeighbours(ulong regionhandle); //should return a array of neighbouring regions
-                AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                string GetName();
-                bool RequestConnection();
-                void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
-         }
-        
-        public abstract class RemoteGridBase : IGridServer
-        {
-                public abstract Dictionary<uint, agentcircuitdata> agentcircuits {
-                        get;
-                        set;
-                }
-                
-                public abstract UUIDBlock RequestUUIDBlock();
-                public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle); 
-                public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                public abstract string GetName();
-                public abstract bool RequestConnection();
-                public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
-        }
-        
-        public abstract class LocalGridBase : IGridServer
-        {
-                public abstract UUIDBlock RequestUUIDBlock();
-                public abstract neighbourinfo[] RequestNeighbours(ulong regionhandle);
-                public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
-                public abstract string GetName();
-                public abstract bool RequestConnection();
-                public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
-                public abstract void AddNewSession(Login session);
-        }
-        
-        public struct UUIDBlock
-        {
-                public LLUUID BlockStart;
-                public LLUUID BlockEnd;
-        }
-        
-        public class AuthenticateResponse
-        {
-                public bool Authorised;
-                public Login LoginInfo;
-                
-                public AuthenticateResponse()
-                {
-                        
-                }
-                        
-        }
-        
-        public class Login
-    {
-        public string First = "Test";
-        public string Last = "User";
-        public LLUUID Agent;
-        public LLUUID Session;
-        public LLUUID InventoryFolder;
-        public LLUUID BaseFolder;
-        public Login()
-        {
-                
-        }
-    }
-        public interface IGridPlugin
-        {
-                IGridServer GetGridServer();
-        }
-        public class agentcircuitdata 
-        {
-                public agentcircuitdata() { }
-                public LLUUID AgentID;
-                public LLUUID SessionID;
-                public LLUUID SecureSessionID;
-                public string firstname;
-                public string lastname;
-                public uint circuitcode;
-                public bool child_agent;
-        }
-        public class neighbourinfo
-        {
-                public neighbourinfo() { }
-                public ulong regionhandle;
-                public uint RegionLocX;
-                public uint RegionLocY;
-                public string sim_ip;
-                public uint sim_port;
-        }
-}
diff --git a/src/GridInterfaces/default.build b/src/GridInterfaces/default.build
deleted file mode 100644
index dd02448..0000000
--- a/src/GridInterfaces/default.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/GridInterfaces.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-gridinterfaces" />
-                        <attribute type="AssemblyDescriptionAttribute" value="Definitions for OGS interface" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/GridInterfaces.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="OpenSim.Framework.dll" />
-                                <include name="libsecondlife.dll" />
-                        </references>
-                        <sources basedir="./">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/GridServers/LoginServer.cs b/src/GridServers/LoginServer.cs
deleted file mode 100644
index dbf211d..0000000
--- a/src/GridServers/LoginServer.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using Nwc.XmlRpc;
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-using System.Security.Cryptography;
-using System.Xml;
-using libsecondlife;
-using OpenSim;
-using OpenSim.Framework;
-namespace OpenSim.GridServers
-{
-        
-        /// <summary>
-        /// When running in local (default) mode , handles client logins.
-        /// </summary>
-        public class LoginServer : LoginService
-        {
-                public LoginServer(IGridServer gridServer)
-                {
-                        _gridServer = gridServer;
-                }
-                private IGridServer _gridServer;
-                private ushort _loginPort = 8080;
-                public IPAddress clientAddress = IPAddress.Loopback;
-                public IPAddress remoteAddress = IPAddress.Any;
-                private Socket loginServer;
-                private int NumClients;
-                private string _defaultResponse;
-                
-                private string _mpasswd;
-                private bool _needPasswd=false;
-                // InitializeLogin: initialize the login 
-                private void InitializeLogin() {
-                        loginServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                        loginServer.Bind(new IPEndPoint(remoteAddress, _loginPort));
-                        loginServer.Listen(1);
-                        
-                        this._needPasswd=false;
-                        //read in default response string
-                        StreamReader SR;
-                string lines;
-                SR=File.OpenText("new-login.dat");
-                
-                //lines=SR.ReadLine();
-                
-                while(!SR.EndOfStream)
-                {
-                        lines = SR.ReadLine();
-                        _defaultResponse += lines;
-                        //lines = SR.ReadLine();
-                }
-                SR.Close();
-                this._mpasswd = EncodePassword("testpass");
-                }
-                
-                public void Startup()
-                {
-                        this.InitializeLogin();
-                        Thread runLoginProxy = new Thread(new ThreadStart(RunLogin));
-                        runLoginProxy.IsBackground = true;
-                        runLoginProxy.Start();
-                }
-                
-                private void RunLogin() 
-                {
-                        Console.WriteLine("Starting Login Server");
-                    try 
-                    {
-                        for (;;) 
-                        {
-                                Socket client = loginServer.Accept();
-                                IPEndPoint clientEndPoint = (IPEndPoint)client.RemoteEndPoint;
-                                
-                                NetworkStream networkStream = new NetworkStream(client);
-                                StreamReader networkReader = new StreamReader(networkStream);
-                                StreamWriter networkWriter = new StreamWriter(networkStream);
-                                try
-                                {
-                                        LoginRequest(networkReader, networkWriter);
-                                }
-                                catch (Exception e)
-                                {
-                                        Console.WriteLine(e.Message);
-                                }
-                                networkWriter.Close();
-                                networkReader.Close();
-                                networkStream.Close();
-                                client.Close();
-                                // send any packets queued for injection
-                                
-                                }
-                    } 
-                    catch (Exception e)
-                    {
-                                Console.WriteLine(e.Message);
-                                Console.WriteLine(e.StackTrace);
-                    }
-                }
-                // ProxyLogin: proxy a login request
-                private void LoginRequest(StreamReader reader, StreamWriter writer) 
-                { 
-                        lock(this)
-                        {
-                                string line;
-                                int contentLength = 0;
-                                // read HTTP header
-                                do
-                                {
-                                        // read one line of the header
-                                        line = reader.ReadLine();
-                                
-                                        // check for premature EOF
-                                        if (line == null)
-                                                throw new Exception("EOF in client HTTP header");
-                                        // look for Content-Length
-                                        Match match = (new Regex(@"Content-Length: (\d+)$")).Match(line);
-                                        if (match.Success)
-                                                contentLength = Convert.ToInt32(match.Groups[1].Captures[0].ToString());
-                                } while (line != "");
-                                
-                                // read the HTTP body into a buffer
-                                char[] content = new char[contentLength];
-                                reader.Read(content, 0, contentLength);
-                                
-                                XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(new String(content));
-                                if(request.MethodName == "login_to_simulator")
-                                {
-                                    XmlRpcResponse response = ProcessRequest(request);
-                                    // forward the XML-RPC response to the client
-                                        writer.WriteLine("HTTP/1.0 200 OK");
-                                        writer.WriteLine("Content-type: text/xml");
-                                        writer.WriteLine();
-                                        
-                                        XmlTextWriter responseWriter = new XmlTextWriter(writer);
-                                        XmlRpcResponseSerializer.Singleton.Serialize(responseWriter, response);
-                                        responseWriter.Close();
-                                }
-                                else
-                                {
-                                        writer.WriteLine("HTTP/1.0 403 Authentication Forbidden");
-                                        writer.WriteLine();
-                                }
-                        }
-                }
-            private XmlRpcResponse ProcessRequest(XmlRpcRequest request)
-            {
-                XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse);
-                                    
-                Hashtable responseData = (Hashtable)response.Value;
-                Hashtable requestData = (Hashtable)request.Params[0];
-                                    
-                string first;
-                string last;
-                string passwd;
-                LLUUID Agent;
-                LLUUID Session;
-                                        
-                //get login name
-                if(requestData.Contains("first"))
-                {
-                    first = (string)requestData["first"];
-                }
-                else
-                {
-                    first = "test";
-                }
-                                        
-                if(requestData.Contains("last"))
-                {
-                    last = (string)requestData["last"];
-                }
-                else
-                {
-                    last = "User"+NumClients.ToString();
-                }
-                                        
-                if(requestData.Contains("passwd"))
-                {
-                    passwd = (string)requestData["passwd"];
-                }
-                else
-                {
-                    passwd = "notfound";
-                }
-                if( !Authenticate(first, last, passwd))
-                {
-                    responseData["reason"] = "key";
-                    responseData["message"] = "You have entered an invalid name/password combination. Check Caps/lock.";
-                    responseData["login"] = "false";
-                }
-                else
-                {
-                    NumClients++;
-                                        
-                    //create a agent and session LLUUID
-                    Agent = GetAgentId( first, last );
-                    Session = LLUUID.Random();
-                                        
-                    //create some login info
-                    Hashtable LoginFlagsHash = new Hashtable();
-                    LoginFlagsHash["daylight_savings"]="N";
-                    LoginFlagsHash["stipend_since_login"]="N";
-                    LoginFlagsHash["gendered"]="Y";
-                    LoginFlagsHash["ever_logged_in"]="Y";
-                    ArrayList LoginFlags=new ArrayList();
-                    LoginFlags.Add(LoginFlagsHash);
-                                        
-                    Hashtable GlobalT = new Hashtable();
-                    GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                    GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                    ArrayList GlobalTextures = new ArrayList();
-                    GlobalTextures.Add(GlobalT);
-                                        
-                    responseData["sim_port"] = OpenSim_Main.cfg.IPListenPort;
-                    responseData["sim_ip"] = OpenSim_Main.cfg.IPListenAddr;
-                    responseData["agent_id"] = Agent.ToStringHyphenated();
-                    responseData["session_id"] = Session.ToStringHyphenated();
-                    responseData["seconds_since_epoch"]=(Int32)(DateTime.UtcNow - new DateTime(1970,1,1)).TotalSeconds;
-                    responseData["login-flags"]=LoginFlags;
-                    responseData["global-textures"]=GlobalTextures;
-                                        
-                    //inventory
-                    ArrayList InventoryList = (ArrayList) responseData["inventory-skeleton"];
-                    Hashtable Inventory1 = (Hashtable)InventoryList[0];
-                    Hashtable Inventory2 = (Hashtable)InventoryList[1];
-                    LLUUID BaseFolderID = LLUUID.Random();
-                    LLUUID InventoryFolderID = LLUUID.Random();
-                    Inventory2["name"] = "Base";
-                    Inventory2["folder_id"] = BaseFolderID.ToStringHyphenated();
-                    Inventory2["type_default"] =6;
-                    Inventory1["folder_id"] = InventoryFolderID.ToStringHyphenated();
-                                        
-                    ArrayList InventoryRoot = (ArrayList) responseData["inventory-root"];
-                    Hashtable Inventoryroot = (Hashtable)InventoryRoot[0];
-                    Inventoryroot["folder_id"] = InventoryFolderID.ToStringHyphenated();
-                                        
-                    CustomiseLoginResponse( responseData, first, last );
-                                        
-                    Login _login = new Login();
-                    //copy data to login object
-                    _login.First = first;
-                    _login.Last = last;
-                    _login.Agent = Agent;
-                    _login.Session = Session;
-                    _login.BaseFolder = BaseFolderID;
-                    _login.InventoryFolder = InventoryFolderID;
-                                        
-                    //working on local computer if so lets add to the gridserver's list of sessions?
-                    if(OpenSim_Main.gridServers.GridServer.GetName() == "Local")
-                    {
-                        ((LocalGridBase)this._gridServer).AddNewSession(_login);
-                    }
-                }
-                return response;
-            }
-            protected virtual void CustomiseLoginResponse( Hashtable responseData, string first, string last )
-                {
-                }
-                protected virtual LLUUID GetAgentId(string firstName, string lastName)
-                {
-                        return LLUUID.Random();
-                }
-                protected virtual bool Authenticate(string first, string last, string  passwd)
-                {
-                        if(this._needPasswd)
-                        {
-                                //every user needs the password to login
-                                string encodedPass = passwd.Remove(0,3); //remove $1$
-                                if(encodedPass == this._mpasswd)
-                                {
-                                        return true;
-                                }
-                                else
-                                {
-                                        return false;
-                                }
-                        }
-                        else
-                        {
-                                //do not need password to login
-                                return true;
-                        }
-                }
-                
-                private static string EncodePassword(string passwd)
-                {
-                        Byte[] originalBytes;
-                        Byte[] encodedBytes;
-                        MD5 md5;
-                        
-                        md5 = new MD5CryptoServiceProvider();
-                        originalBytes = ASCIIEncoding.Default.GetBytes(passwd);
-                        encodedBytes = md5.ComputeHash(originalBytes);
-                        return Regex.Replace(BitConverter.ToString(encodedBytes), "-", "").ToLower();
-                }
-                
-        }
-        
-}
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
deleted file mode 100644
index 4b17ba2..0000000
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-localservers")]
-[assembly: AssemblyDescriptionAttribute("local grid servers")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/LocalServers/LocalGridServers/LocalGridServers.csproj b/src/LocalServers/LocalGridServers/LocalGridServers.csproj
deleted file mode 100644
index 7a5ce3d..0000000
--- a/src/LocalServers/LocalGridServers/LocalGridServers.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>LocalGridServers</RootNamespace>
-    <AssemblyName>LocalGridServers</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D7F0395B-FADC-4936-80A0-D95AACE92F62}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="libsecondlife">
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LocalGrid.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/LocalServers/default.build b/src/LocalServers/default.build
deleted file mode 100644
index 14c52cd..0000000
--- a/src/LocalServers/default.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/LocalGridServers.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="LocalGridServers/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-localservers" />
-                        <attribute type="AssemblyDescriptionAttribute" value="local grid servers" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/LocalGridServers.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="libsecondlife.dll" />
-                                <include name="GridInterfaces.dll" />
-                                <include name="ServerConsole.dll" />
-                        </references>
-                        <sources basedir="LocalGridServers/">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
deleted file mode 100644
index 0c5ff75..0000000
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-localstorage")]
-[assembly: AssemblyDescriptionAttribute("The local storage handler")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj b/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj
deleted file mode 100644
index c00771c..0000000
--- a/src/LocalStorage/Db4LocalStorage/Db4LocalStorage.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Db4LocalStorage</RootNamespace>
-    <AssemblyName>Db4LocalStorage</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{74784F23-B0FD-484C-82C1-96C0215733DC}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="libsecondlife">
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Db4objects.Db4o">
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Db4LocalStorage.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/LocalStorage/default.build b/src/LocalStorage/default.build
deleted file mode 100644
index 5ed183e..0000000
--- a/src/LocalStorage/default.build
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../bin/Db4LocalStorage.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="Db4LocalStorage/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-localstorage" />
-                        <attribute type="AssemblyDescriptionAttribute" value="The local storage handler" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/Db4LocalStorage.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin/" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Data.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="libsecondlife.dll" />
-                                <include name="GridInterfaces.dll" />
-                                <include name="ServerConsole.dll" />
-                                <include name="Db4objects.Db4o.dll" />
-                        </references>
-                        <sources basedir="Db4LocalStorage/">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/Main.cs b/src/Main.cs
deleted file mode 100644
index a738d03..0000000
--- a/src/Main.cs
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.world;
-using OpenSim.GridServers;
-using OpenSim.Assets;
-using ServerConsole;
-using PhysicsSystem;
-namespace OpenSim
-{
-        /// <summary>
-        /// Description of MainForm.
-        /// </summary>
-        public class OpenSim_Main
-        {
-                public static OpenSim_Main sim;
-                public static SimConfig cfg;
-                public static World local_world;
-                public static Grid gridServers;
-                public static SimCAPSHTTPServer http_server;
-        
-                public static Socket Server;
-                private static IPEndPoint ServerIncoming;
-                private static byte[] RecvBuffer = new byte[4096];
-                private byte[] ZeroBuffer = new byte[8192];
-                private static IPEndPoint ipeSender;
-                private static EndPoint epSender;
-                private static AsyncCallback ReceivedData;
-                public AssetCache assetCache;
-                public DateTime startuptime;
-                public Dictionary<EndPoint, OpenSimClient> ClientThreads = new Dictionary<EndPoint, OpenSimClient>();
-                private PhysicsManager physManager;
-                private System.Timers.Timer timer1 = new System.Timers.Timer();
-                private string ConfigDll = "SimConfig.dll";
-                private string _physicsEngine = "PhysX";
-                public bool sandbox = false;
-                public bool loginserver = false;
-                
-                [STAThread]
-                public static void Main( string[] args )
-                {
-                        Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
-                        Console.WriteLine("Starting...\n");
-                        ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0);
-                        
-                        sim = new OpenSim_Main();
-            sim.sandbox = false;
-            sim.loginserver = false;
-            sim._physicsEngine = "PhysX";
-                    
-                        for (int i = 0; i < args.Length; i++)
-                        {
-                                if(args[i] == "-sandbox")
-                                {
-                                        sim.sandbox = true;
-                                }
-                            
-                                if(args[i] == "-loginserver")
-                                {
-                                        sim.loginserver = true;
-                                }
-                                if(args[i] == "-realphysx")
-                                {
-                                        sim._physicsEngine = "RealPhysX";
-                                        OpenSim.world.Avatar.PhysicsEngineFlying = true;
-                                }
-                        }
-                        
-                        OpenSim_Main.gridServers = new Grid();
-                        if(sim.sandbox)
-                        {
-                                OpenSim_Main.gridServers.AssetDll = "LocalGridServers.dll";
-                                OpenSim_Main.gridServers.GridDll = "LocalGridServers.dll";
-                                OpenSim_Main.gridServers.LoadPlugins();
-                                ServerConsole.MainConsole.Instance.WriteLine("Starting in Sandbox mode");
-                        }
-                        else
-                        {
-                                OpenSim_Main.gridServers.AssetDll = "RemoteGridServers.dll";
-                                OpenSim_Main.gridServers.GridDll = "RemoteGridServers.dll";
-                                OpenSim_Main.gridServers.LoadPlugins();
-                                ServerConsole.MainConsole.Instance.WriteLine("Starting in Grid mode");
-                        }
-                        
-                        if(sim.loginserver && sim.sandbox)
-                        {
-                                LoginServer loginServer = new LoginServer(OpenSim_Main.gridServers.GridServer);
-                                loginServer.Startup();
-                        }
-                        sim.assetCache = new AssetCache(OpenSim_Main.gridServers.AssetServer);
-                        
-                        sim.Startup();
-                        
-                        while(true) {
-                                ServerConsole.MainConsole.Instance.MainConsolePrompt();
-                        }
-                }
-                private OpenSim_Main() {
-                }
-                
-                private void Startup() {
-                        startuptime=DateTime.Now;
-                        
-                        // We check our local database first, then the grid for config options
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration");
-                        cfg = this.LoadConfigDll(this.ConfigDll);
-                        cfg.InitConfig();
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Contacting gridserver");
-                        cfg.LoadFromGrid();
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString());
-                        ServerConsole.MainConsole.Instance.WriteLine("Initialising world");
-                        local_world = cfg.LoadWorld();
-                        this.physManager = new PhysicsSystem.PhysicsManager();
-                        this.physManager.LoadPlugins();
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
-                        local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use
-                        local_world.PhysScene.SetTerrain(local_world.LandMap);
-                        OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
-                        OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey, OpenSim_Main.cfg.GridRecvKey, OpenSim_Main.cfg.UserURL, OpenSim_Main.cfg.UserSendKey, OpenSim_Main.cfg.UserRecvKey);
-                        
-                        local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded.
-                        local_world.LoadPrimsFromStorage();
-                        
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
-                        http_server = new SimCAPSHTTPServer();
-            timer1.Enabled = true;
-            timer1.Interval = 100;
-            timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
-            MainServerListener();
-                }
-                
-                private SimConfig LoadConfigDll(string dllName)
-                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-                        SimConfig config = null;
-                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                                if (pluginType.IsPublic)
-                                {
-                                        if (!pluginType.IsAbstract)
-                                        {
-                                                Type typeInterface = pluginType.GetInterface("ISimConfig", true);
-                                                
-                                                if (typeInterface != null)
-                                                {
-                                                        ISimConfig plug = (ISimConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        config = plug.GetConfigObject();
-                                                        break;
-                                                }
-                                                
-                                                typeInterface = null;
-                                        }
-                                }
-                        }
-                        pluginAssembly = null;
-                        return config;
-                }
-                private void OnReceivedData(IAsyncResult result) {
-                        ipeSender = new IPEndPoint(IPAddress.Any, 0);
-                        epSender = (EndPoint)ipeSender;
-                        Packet packet = null;
-                        int numBytes = Server.EndReceiveFrom(result, ref epSender);
-                        int packetEnd = numBytes - 1;
-                        packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
-                        
-                        // This is either a new client or a packet to send to an old one
-                        if(ClientThreads.ContainsKey(epSender)) {
-                                ClientThreads[epSender].InPacket(packet);
-                        } else if( packet.Type == PacketType.UseCircuitCode ) { // new client
-                                OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet);
-                                ClientThreads.Add(epSender, newuser);
-                        } else { // invalid client
-                                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
-                        }
-                        Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-                }
-                private void MainServerListener() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:MainServerListener() - New thread started");
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + cfg.IPListenAddr + ":" + cfg.IPListenPort);
-                        ServerIncoming = new IPEndPoint(IPAddress.Any, cfg.IPListenPort);
-                        Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-                        Server.Bind(ServerIncoming);
-                        
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:MainServerListener() - UDP socket bound, getting ready to listen");
-                        ipeSender = new IPEndPoint(IPAddress.Any, 0);
-                        epSender = (EndPoint) ipeSender;
-                        ReceivedData = new AsyncCallback(this.OnReceivedData);
-                        Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
-                        
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:MainServerListener() - Listening...");
-                        
-                }
-                
-                public static void Shutdown() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Closing all threads");
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Killing listener thread");
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Killing clients");
-                        // IMPLEMENT THIS
-                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Closing console and terminating");
-                        OpenSim_Main.local_world.Close();
-                        ServerConsole.MainConsole.Instance.Close();
-                        Environment.Exit(0);
-                }
-                
-                void Timer1Tick( object sender, System.EventArgs e )
-                {
-                        
-                        local_world.Update();
-                }
-        }
-        
-        public class Grid
-        {
-                public IAssetServer AssetServer;
-                public IGridServer GridServer;
-                public string AssetDll = "";
-                public string GridDll = "";
-                
-                public Grid()
-                {
-                }
-                
-                public void LoadPlugins()
-                {
-                        this.AssetServer = this.LoadAssetDll(this.AssetDll);
-                        this.GridServer = this.LoadGridDll(this.GridDll);
-                }
-                
-                private IAssetServer LoadAssetDll(string dllName)
-                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-                        IAssetServer server = null;
-                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                                if (pluginType.IsPublic)
-                                {
-                                        if (!pluginType.IsAbstract)
-                                        {
-                                                Type typeInterface = pluginType.GetInterface("IAssetPlugin", true);
-                                                
-                                                if (typeInterface != null)
-                                                {
-                                                        IAssetPlugin plug = (IAssetPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        server = plug.GetAssetServer();
-                                                        break;
-                                                }
-                                                
-                                                typeInterface = null;
-                                        }
-                                }
-                        }
-                        pluginAssembly = null;
-                        return server;
-                }
-                
-                private IGridServer LoadGridDll(string dllName)
-                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-                        IGridServer server = null;
-                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                                if (pluginType.IsPublic)
-                                {
-                                        if (!pluginType.IsAbstract)
-                                        {
-                                                Type typeInterface = pluginType.GetInterface("IGridPlugin", true);
-                                                
-                                                if (typeInterface != null)
-                                                {
-                                                        IGridPlugin plug = (IGridPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        server = plug.GetGridServer();
-                                                        break;
-                                                }
-                                                
-                                                typeInterface = null;
-                                        }
-                                }
-                        }
-                        pluginAssembly = null;
-                        return server;
-                }
-        }
-}
diff --git a/src/OpenSim.Framework/AssemblyInfo.cs b/src/OpenSim.Framework/AssemblyInfo.cs
deleted file mode 100644
index 32f1380..0000000
--- a/src/OpenSim.Framework/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
-[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/OpenSim.Framework/OpenSim.Framework.csproj b/src/OpenSim.Framework/OpenSim.Framework.csproj
deleted file mode 100644
index ec586c3..0000000
--- a/src/OpenSim.Framework/OpenSim.Framework.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenSim.Framework</RootNamespace>
-    <AssemblyName>OpenGrid.Framework</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LoginService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/OpenSim.Framework/Properties/AssemblyInfo.cs b/src/OpenSim.Framework/Properties/AssemblyInfo.cs
deleted file mode 100644
index 72e55b9..0000000
--- a/src/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Playahead AB")]
-[assembly: AssemblyProduct("OpenGrid.Framework")]
-[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("67d2b810-0969-4550-ab2b-d2f5ac191191")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/OpenSim.Framework/default.build b/src/OpenSim.Framework/default.build
deleted file mode 100644
index 57dfee8..0000000
--- a/src/OpenSim.Framework/default.build
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim.Framework" default="build" basedir=".">
-        <description>nant buildfile for OpenSim.Framework</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/OpenSim.Framework.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-gridinterfaces" />
-                        <attribute type="AssemblyDescriptionAttribute" value="Definitions for OGS interface" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/OpenSim.Framework.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="libsecondlife.dll" />
-                                <include name="GridInterfaces.dll" />
-                        </references>
-                        <sources basedir="./">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/OpenSimClient.cs b/src/OpenSimClient.cs
deleted file mode 100644
index dd698e4..0000000
--- a/src/OpenSimClient.cs
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.GridServers;
-using OpenSim.world;
-namespace OpenSim
-{
-        /// <summary>
-        /// Handles new client connections
-        /// Constructor takes a single Packet and authenticates everything
-        /// </summary>
-        public class OpenSimClient {
-                
-                public LLUUID AgentID;
-                public LLUUID SessionID;
-                public uint CircuitCode;
-                public world.Avatar ClientAvatar;
-                private UseCircuitCodePacket cirpack;
-                private Thread ClientThread;
-                public EndPoint userEP;
-                private BlockingQueue<QueItem> PacketQueue;
-                private Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
-                private Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
-                private System.Timers.Timer AckTimer;
-                private uint Sequence = 0;
-                private object SequenceLock = new object();
-                private const int MAX_APPENDED_ACKS = 10;
-                private const int RESEND_TIMEOUT = 4000;
-                private const int MAX_SEQUENCE = 0xFFFFFF;
-        
-                public void ack_pack(Packet Pack) {
-                    //libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
-                    //ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
-                    //ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
-                    //ack_it.Packets[0].ID = Pack.Header.ID;
-                    //ack_it.Header.Reliable = false;
-                    //OutPacket(ack_it);
-                        
-                    if (Pack.Header.Reliable) {
-                            lock (PendingAcks) {
-                                uint sequence = (uint)Pack.Header.Sequence;
-                                if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
-                            }
-                    }
-                }
-                
-                public void ProcessInPacket(Packet Pack) {
-                    ack_pack(Pack);
-                    switch(Pack.Type) {
-                        case PacketType.CompleteAgentMovement:
-                                ClientAvatar.CompleteMovement(OpenSim_Main.local_world);
-                                ClientAvatar.SendInitialPosition();
-                                break;
-                        case PacketType.RegionHandshakeReply:
-                                OpenSim_Main.local_world.SendLayerData(this);
-                                break;
-                        case PacketType.AgentWearablesRequest:
-                                ClientAvatar.SendInitialAppearance();
-                                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                        if(client.AgentID != this.AgentID)
-                                        {
-                                                ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
-                                                this.OutPacket(objupdate);
-                                                client.ClientAvatar.SendAppearanceToOtherAgent(this);
-                                        }
-                                }
-                                OpenSim_Main.local_world.GetInitialPrims(this);
-                                break;
-                        case PacketType.ObjectAdd:
-                                OpenSim_Main.local_world.AddNewPrim((ObjectAddPacket)Pack, this);
-                                break;
-                        case PacketType.ObjectLink:
-                                ServerConsole.MainConsole.Instance.WriteLine(Pack.ToString());
-                                break;
-                        case PacketType.ObjectScale:
-                                ServerConsole.MainConsole.Instance.WriteLine(Pack.ToString());
-                                break;
-                        case PacketType.ObjectShape:
-                                ObjectShapePacket shape = (ObjectShapePacket)Pack;
-                                for(int i =0; i <shape.ObjectData.Length; i++)
-                                {
-                                        foreach (Entity ent in OpenSim_Main.local_world.Entities.Values)
-                                        {
-                                                if(ent.localid == shape.ObjectData[i].ObjectLocalID)
-                                                {
-                                                        ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);
-                                                }
-                                        }
-                                }
-                                break;
-                        case PacketType.MultipleObjectUpdate :
-                                MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)Pack;
-                                for( int i = 0; i < multipleupdate.ObjectData.Length; i++ )
-                                {
-                                        if( multipleupdate.ObjectData[ i ].Type == 9 ) //change position
-                                        {
-                                                libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[ i ].Data, 0 );
-                                                foreach (Entity ent in OpenSim_Main.local_world.Entities.Values)
-                                                {
-                                                        if(ent.localid == multipleupdate.ObjectData[ i ].ObjectLocalID)
-                                                        {
-                                                                ((OpenSim.world.Primitive)ent).UpdatePosition( pos);
-                                                                
-                                                        }
-                                                }
-                                                
-                                                //should update stored position of the prim
-                                        }
-                                        else if(multipleupdate.ObjectData[i].Type == 10 )//rotation
-                                        {
-                                                libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
-                                                foreach (Entity ent in OpenSim_Main.local_world.Entities.Values)
-                                                {
-                                                        if(ent.localid == multipleupdate.ObjectData[ i ].ObjectLocalID)
-                                                        {
-                                                                ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.W);
-                                                                ((OpenSim.world.Primitive)ent).UpdateFlag = true;
-                                                        }
-                                                }
-                                        }
-                                        else if(multipleupdate.ObjectData[i].Type == 13 )//scale
-                                        {
-                                                
-                                                libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[ i ].Data, 12 );
-                                                foreach (Entity ent in OpenSim_Main.local_world.Entities.Values)
-                                                {
-                                                        if(ent.localid == multipleupdate.ObjectData[ i ].ObjectLocalID)
-                                                        { 
-                                                                ((OpenSim.world.Primitive)ent).Scale = scale;
-                                                        }
-                                                }
-                                        }
-                                }
-                                break;
-                        case PacketType.TransferRequest:
-                                //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
-                                TransferRequestPacket transfer = (TransferRequestPacket)Pack;
-                                OpenSim_Main.sim.assetCache.AddAssetRequest(this, transfer);
-                                break;
-                        case PacketType.AgentUpdate:
-                                ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack);
-                                break;
-                        case PacketType.LogoutRequest:
-                                ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got a logout request");
-                                //tell all clients to kill our object
-                                KillObjectPacket kill = new KillObjectPacket();
-                                kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
-                                kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-                                kill.ObjectData[0].ID = this.ClientAvatar.localid;
-                                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                        client.OutPacket(kill);
-                                }
-                                OpenSim_Main.gridServers.GridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
-                                lock(OpenSim_Main.local_world.Entities) {
-                                        OpenSim_Main.local_world.Entities.Remove(this.AgentID);
-                                }
-                                //need to do other cleaning up here too
-                                OpenSim_Main.sim.ClientThreads.Remove(this.userEP);
-                                this.ClientThread.Abort();
-                                break;
-                        case PacketType.ChatFromViewer:
-                                ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
-                                if(Helpers.FieldToString(inchatpack.ChatData.Message)=="") break;
-                                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                                libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
-                                reply.ChatData.Audible = 1;
-                                reply.ChatData.Message = inchatpack.ChatData.Message;
-                                reply.ChatData.ChatType = 1;
-                                reply.ChatData.SourceType = 1;
-                                reply.ChatData.Position = this.ClientAvatar.position;
-                                reply.ChatData.FromName = _enc.GetBytes(this.ClientAvatar.firstname + " " + this.ClientAvatar.lastname + "\0");
-                                reply.ChatData.OwnerID = this.AgentID;
-                                reply.ChatData.SourceID = this.AgentID;
-                                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                        client.OutPacket(reply);
-                                }
-                                break;
-                    }
-                }
-                private void ResendUnacked()
-                {
-                                int now = Environment.TickCount;
-                                lock (NeedAck)
-                                {
-                                        foreach (Packet packet in NeedAck.Values)
-                                        {
-                                                if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
-                                                {
-                                                        ServerConsole.MainConsole.Instance.WriteLine("Resending " + packet.Type.ToString() + " packet, " +
-                                                         (now - packet.TickCount) + "ms have passed");
-                                                        packet.Header.Resent = true;
-                                                        OutPacket(packet);
-                                                }
-                                        }
-                                }
-                }
-                private void SendAcks()
-                {
-                        lock (PendingAcks)
-                        {
-                                if (PendingAcks.Count > 0)
-                                {
-                                        if (PendingAcks.Count > 250)
-                                        {
-                                                // FIXME: Handle the odd case where we have too many pending ACKs queued up
-                                                ServerConsole.MainConsole.Instance.WriteLine("Too many ACKs queued up!");
-                                                return;
-                                        }
-                                        
-                                        ServerConsole.MainConsole.Instance.WriteLine("Sending PacketAck");
-                                        
-                                        int i = 0;
-                                        PacketAckPacket acks = new PacketAckPacket();
-                                        acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
-                                        foreach (uint ack in PendingAcks.Values)
-                                        {
-                                                acks.Packets[i] = new PacketAckPacket.PacketsBlock();
-                                                acks.Packets[i].ID = ack;
-                                                i++;
-                                        }
-                                        acks.Header.Reliable = false;
-                                        OutPacket(acks);
-                                        PendingAcks.Clear();
-                                }
-                        }
-                }
-                private void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
-                {
-                        SendAcks();
-                        ResendUnacked();
-                }
-                public void ProcessOutPacket(Packet Pack) {
-                                // Keep track of when this packet was sent out
-                                Pack.TickCount = Environment.TickCount;
-                                if (!Pack.Header.Resent)
-                                {
-                                        // Set the sequence number
-                                        lock (SequenceLock)
-                                        {
-                                                if (Sequence >= MAX_SEQUENCE)
-                                                        Sequence = 1;
-                                                else
-                                                        Sequence++;
-                                                Pack.Header.Sequence = Sequence;
-                                        }
-                                        if (Pack.Header.Reliable)  //DIRTY HACK
-                                        {
-                                                lock (NeedAck)
-                                                {
-                                                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))
-                                                        {
-                                                                NeedAck.Add(Pack.Header.Sequence, Pack);
-                                                        }
-                                                        else
-                                                        {
-                                                                //  Client.Log("Attempted to add a duplicate sequence number (" +
-                                                                //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
-                                                                //      packet.Type.ToString(), Helpers.LogLevel.Warning);
-                                                        }
-                                                }
-                                                // Don't append ACKs to resent packets, in case that's what was causing the
-                                                // delivery to fail
-                                                if (!Pack.Header.Resent)
-                                                {
-                                                        // Append any ACKs that need to be sent out to this packet
-                                                        lock (PendingAcks)
-                                                        {
-                                                                if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
-                                                                    Pack.Type != PacketType.PacketAck &&
-                                                                    Pack.Type != PacketType.LogoutRequest)
-                                                                {
-                                                                        Pack.Header.AckList = new uint[PendingAcks.Count];
-                                                                        int i = 0;
-                                                                        
-                                                                        foreach (uint ack in PendingAcks.Values)
-                                                                        {
-                                                                                Pack.Header.AckList[i] = ack;
-                                                                                i++;
-                                                                        }
-                                                                        PendingAcks.Clear();
-                                                                        Pack.Header.AppendedAcks = true;
-                                                                }
-                                                        }
-                                                }
-                                        }
-                                }
-                        //ServerConsole.MainConsole.Instance.WriteLine("OUT: \n" + Pack.ToString());
-                    byte[] ZeroOutBuffer = new byte[4096];
-                    byte[] sendbuffer; 
-                    sendbuffer = Pack.ToBytes();
-                    try {
-                        if (Pack.Header.Zerocoded) {
-                                int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
-                                OpenSim_Main.Server.SendTo(ZeroOutBuffer, packetsize, SocketFlags.None,userEP);
-                        } else {
-                                OpenSim_Main.Server.SendTo(sendbuffer, sendbuffer.Length, SocketFlags.None,userEP);
-                        }
-                    } catch (Exception) {
-                        ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
-                        ClientThread.Abort();
-                    }
-        
-                }
-                public void InPacket(Packet NewPack) {
-                        // Handle appended ACKs
-                        if (NewPack.Header.AppendedAcks)
-                        {
-                                lock (NeedAck)
-                                {
-                                        foreach (uint ack in NewPack.Header.AckList)
-                                        {
-                                                NeedAck.Remove(ack);
-                                        }
-                                }
-                        }
-                        // Handle PacketAck packets
-                        if (NewPack.Type == PacketType.PacketAck)
-                        {
-                                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
-                                lock (NeedAck)
-                                {
-                                        foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
-                                        {
-                                                NeedAck.Remove(block.ID);
-                                        }
-                                }
-                        } else if( ( NewPack.Type == PacketType.StartPingCheck ) ) {
-                                //reply to pingcheck
-                                libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
-                                libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
-                                endPing.PingID.PingID = startPing.PingID.PingID;
-                                OutPacket(endPing);
-                        }
-                        else
-                        {
-                                QueItem item = new QueItem();
-                                item.Packet = NewPack;
-                                item.Incoming = true;
-                                this.PacketQueue.Enqueue(item);
-                        }
-                        
-                }
-                public void OutPacket(Packet NewPack) {
-                        QueItem item = new QueItem();
-                        item.Packet = NewPack;
-                        item.Incoming = false;
-                        this.PacketQueue.Enqueue(item);
-                }
-                public OpenSimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack) {
-                ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request");
-                        cirpack = initialcirpack;
-                        userEP = remoteEP;
-                        PacketQueue = new BlockingQueue<QueItem>();
-                        AckTimer = new System.Timers.Timer(500);
-                        AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
-                        AckTimer.Start();
-                        ClientThread = new Thread(new ThreadStart(AuthUser));
-                        ClientThread.IsBackground = true;
-                        ClientThread.Start();
-                }
-                
-                private void ClientLoop() {
-                        ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:ClientLoop() - Entered loop");
-                        while(true) {
-                                QueItem nextPacket = PacketQueue.Dequeue();
-                                if(nextPacket.Incoming)
-                                {
-                                        //is a incoming packet
-                                        ProcessInPacket(nextPacket.Packet);
-                                }
-                                else
-                                {
-                                        //is a out going packet
-                                        ProcessOutPacket(nextPacket.Packet);
-                                }       
-                        }
-                }
-                private void InitNewClient() {
-                        ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
-                        OpenSim_Main.local_world.AddViewerAgent(this);
-                        world.Entity tempent=OpenSim_Main.local_world.Entities[this.AgentID];
-                        this.ClientAvatar=(world.Avatar)tempent;
-                }
-                
-                private void AuthUser() 
-                {
-                        AuthenticateResponse sessionInfo = OpenSim_Main.gridServers.GridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
-                        if(!sessionInfo.Authorised)
-                        {
-                                //session/circuit not authorised
-                                ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
-                                ClientThread.Abort();
-                        }
-                        else
-                        {
-                                ServerConsole.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
-                                //session is authorised
-                                this.AgentID=cirpack.CircuitCode.ID;
-                                this.SessionID=cirpack.CircuitCode.SessionID;
-                                this.CircuitCode=cirpack.CircuitCode.Code;
-                                InitNewClient();
-                                this.ClientAvatar.firstname = sessionInfo.LoginInfo.First;
-                                this.ClientAvatar.lastname = sessionInfo.LoginInfo.Last;
-                                ClientLoop();   
-                        }
-                }
-        }
-}
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
deleted file mode 100644
index 7d3f314..0000000
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
-[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
deleted file mode 100644
index adb3d0f..0000000
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-using OpenSim.GridServers;
-namespace RemoteGridServers
-{
-        /// <summary>
-        /// 
-        /// </summary>
-        /// 
-        
-        public class RemoteGridPlugin : IGridPlugin
-        {
-                public RemoteGridPlugin()
-                {
-                        
-                }
-                
-                public IGridServer GetGridServer()
-                {
-                        return(new RemoteGridServer());
-                }
-        }
-        
-        public class RemoteAssetPlugin : IAssetPlugin
-        {
-                public RemoteAssetPlugin()
-                {
-                        
-                }
-                
-                public IAssetServer GetAssetServer()
-                {
-                        return(new RemoteAssetServer());
-                }
-        }
-        public class RemoteGridServer : RemoteGridBase
-        {
-                private string GridServerUrl;
-                private string GridSendKey;
-                private string GridRecvKey;
-                private string UserServerUrl;
-                private string UserSendKey;
-                private string UserRecvKey;
-                private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>(); 
-                public override Dictionary<uint, agentcircuitdata> agentcircuits {
-                        get {return AgentCircuits;} 
-                        set {AgentCircuits=value;}
-                }
-        
-                public RemoteGridServer()
-                {
-                        ServerConsole.MainConsole.Instance.WriteLine("Remote Grid Server class created");
-                }
-                
-                public override bool RequestConnection()
-                {
-                        return true;
-                }
-        
-                public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
-                {
-                        agentcircuitdata validcircuit=this.AgentCircuits[circuitcode];
-                        AuthenticateResponse user = new AuthenticateResponse();
-                        if((sessionID==validcircuit.SessionID) && (agentID==validcircuit.AgentID)) 
-                        {
-                                // YAY! Valid login
-                                user.Authorised = true;
-                                user.LoginInfo = new Login();
-                                user.LoginInfo.Agent = agentID;
-                                user.LoginInfo.Session = sessionID;
-                                user.LoginInfo.First = validcircuit.firstname;
-                                user.LoginInfo.Last = validcircuit.lastname;
-                        }
-                        else 
-                        {
-                                // Invalid
-                                user.Authorised = false;        
-                        }
-                        
-                        return(user);
-                }
-                
-                public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
-                {
-                        WebRequest DeleteSession = WebRequest.Create(UserServerUrl + "/usersessions/" + sessionID.ToString());
-                        DeleteSession.Method="DELETE";
-                        DeleteSession.ContentType="text/plaintext";
-                        DeleteSession.ContentLength=0;
-                        StreamWriter stOut = new StreamWriter (DeleteSession.GetRequestStream(), System.Text.Encoding.ASCII);
-                        stOut.Write("");
-                        stOut.Close();
-                        StreamReader stIn = new StreamReader(DeleteSession.GetResponse().GetResponseStream());
-                        string GridResponse = stIn.ReadToEnd();
-                        stIn.Close(); 
-                        return(true);
-                }
-                
-                public override UUIDBlock RequestUUIDBlock()
-                {
-                        UUIDBlock uuidBlock = new UUIDBlock();
-                        return(uuidBlock);
-                }
-                
-                public override neighbourinfo[] RequestNeighbours(ulong regionhandle)
-                {
-                        ArrayList neighbourlist = new ArrayList();
-                        
-                        WebRequest FindNeighbours = WebRequest.Create(GridServerUrl + "/regions/" + regionhandle.ToString() + "/neighbours");
-                        FindNeighbours.ContentType="text/plaintext";
-                        FindNeighbours.ContentLength=0;
-                        StreamWriter stOut = new StreamWriter (FindNeighbours.GetRequestStream(), System.Text.Encoding.ASCII);
-                        stOut.Write("");
-                        stOut.Close();
-                        
-                        XmlDocument GridRespXml = new XmlDocument();
-                        GridRespXml.Load(FindNeighbours.GetResponse().GetResponseStream());
-                        
-                        XmlNode NeighboursRoot = GridRespXml.FirstChild;
-                        if(NeighboursRoot.Name != "neighbours") {
-                                return new neighbourinfo[0];
-                        }
-                        FindNeighbours.GetResponse().GetResponseStream().Close();       
-                        
-                        return new neighbourinfo[0];
-                }
-                
-                public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerUrl, string GridSendKey, string GridRecvKey)
-                {
-                        this.UserServerUrl = UserServerUrl;
-                        this.UserSendKey = UserSendKey;                 
-                        this.UserRecvKey = UserRecvKey;
-                        this.GridServerUrl = GridServerUrl;
-                        this.GridSendKey = GridSendKey;
-                        this.GridRecvKey = GridRecvKey;
-                }
-                
-                public override string GetName()
-                { 
-                        return "Remote";
-                }
-        }
-        
-        
-        public class RemoteAssetServer : IAssetServer
-        {
-                private IAssetReceiver _receiver;
-                private BlockingQueue<ARequest> _assetRequests;
-                private Thread _remoteAssetServerThread;
-                private string AssetServerUrl;
-                private string AssetSendKey;
-                
-                public RemoteAssetServer()
-                {
-                        this._assetRequests = new BlockingQueue<ARequest>();
-                        this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
-                        this._remoteAssetServerThread.IsBackground = true;
-                        this._remoteAssetServerThread.Start();
-                        ServerConsole.MainConsole.Instance.WriteLine("Remote Asset Server class created");
-                }
-                
-                public void SetReceiver(IAssetReceiver receiver)
-                {
-                        this._receiver = receiver;
-                }
-                
-                public void RequestAsset(LLUUID assetID, bool isTexture)
-                {
-                        ARequest req = new ARequest();
-                        req.AssetID = assetID;
-                        req.IsTexture = isTexture;
-                        this._assetRequests.Enqueue(req);
-                }
-                
-                public void UpdateAsset(AssetBase asset)
-                {
-                        
-                }
-                
-                public void UploadNewAsset(AssetBase asset)
-                {
-                        
-                }
-                
-                public void SetServerInfo(string ServerUrl, string ServerKey)
-                {
-                        this.AssetServerUrl = ServerUrl;
-                        this.AssetSendKey = ServerKey;
-                }
-                
-                private void RunRequests()
-                {
-                        while(true)
-                        {
-                                //we need to add support for the asset server not knowing about a requested asset
-                                ARequest req = this._assetRequests.Dequeue();
-                                LLUUID assetID = req.AssetID;
-                                ServerConsole.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it");
-                                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
-                                WebResponse AssetResponse = AssetLoad.GetResponse();
-                                byte[] idata = new byte[(int)AssetResponse.ContentLength];
-                                BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
-                                idata = br.ReadBytes((int)AssetResponse.ContentLength);
-                                br.Close();
-                                
-                                AssetBase asset = new AssetBase();
-                                asset.FullID = assetID;
-                                asset.Data = idata;
-                                _receiver.AssetReceived(asset, req.IsTexture );
-                        }
-                }
-        }
-        public class BlockingQueue< T > {
-                private Queue< T > _queue = new Queue< T >();
-                private object _queueSync = new object();
-                public void Enqueue(T value)
-                {
-                        lock(_queueSync)
-                        {
-                                _queue.Enqueue(value);
-                                Monitor.Pulse(_queueSync);
-                        }
-                }
-                public T Dequeue()
-                {
-                        lock(_queueSync)
-                        {
-                                if( _queue.Count < 1)
-                                        Monitor.Wait(_queueSync);
-                                return _queue.Dequeue();
-                        }
-                }
-        }
-}
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj b/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj
deleted file mode 100644
index f1c5649..0000000
--- a/src/RemoteServers/RemoteGridServers/RemoteGridServers.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>RemoteGridServers</RootNamespace>
-    <AssemblyName>RemoteGridServers</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="libsecondlife">
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RemoteGrid.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/RemoteServers/default.build b/src/RemoteServers/default.build
deleted file mode 100644
index f8e6977..0000000
--- a/src/RemoteServers/default.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/RemoteGridServers.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="RemoteGridServers/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-remoteservers" />
-                        <attribute type="AssemblyDescriptionAttribute" value="Connects to remote OGS installation" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/RemoteGridServers.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="libsecondlife.dll" />
-                                <include name="GridInterfaces.dll" />
-                                <include name="ServerConsole.dll" />
-                        </references>
-                        <sources basedir="RemoteGridServers/">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/Second-server.csproj b/src/Second-server.csproj
deleted file mode 100644
index 7c0d17c..0000000
--- a/src/Second-server.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>OpenSim</RootNamespace>
-    <AssemblyName>OpenSim</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid>
-    <StartupObject>OpenSim.OpenSim_Main</StartupObject>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\bin\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="libsecondlife">
-      <HintPath>..\bin\libsecondlife.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Axiom.MathLib">
-      <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\bin\log4net.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Config.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="OpenSimClient.cs" />
-    <Compile Include="types\Mesh.cs" />
-    <Compile Include="types\Triangle.cs" />
-    <Compile Include="Util.cs" />
-    <Compile Include="world\Avatar.cs" />
-    <Compile Include="world\Entity.cs" />
-    <Compile Include="world\Primitive.cs" />
-    <Compile Include="world\ScriptEngine.cs" />
-    <Compile Include="world\scripting\IScript.cs" />
-    <Compile Include="world\SurfacePatch.cs" />
-    <Compile Include="world\World.cs" />
-    <Compile Include="GridServers\LoginServer.cs" />
-    <Compile Include="Assets\AssetCache.cs" />
-    <Compile Include="OpenSimConsole.cs" />
-    <Compile Include="HeightMapGenHills.cs" />
-    <Compile Include="VersionInfo.cs" />
-    <Compile Include="CAPS\SimHttp.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="GridInterfaces\GridInterfaces.csproj">
-      <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project>
-      <Name>GridInterfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="LocalServers\LocalGridServers\LocalGridServers.csproj">
-      <Project>{D7F0395B-FADC-4936-80A0-D95AACE92F62}</Project>
-      <Name>LocalGridServers</Name>
-    </ProjectReference>
-    <ProjectReference Include="LocalStorage\Db4LocalStorage\Db4LocalStorage.csproj">
-      <Project>{74784F23-B0FD-484C-82C1-96C0215733DC}</Project>
-      <Name>Db4LocalStorage</Name>
-    </ProjectReference>
-    <ProjectReference Include="OpenSim.Framework\OpenSim.Framework.csproj">
-      <Project>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</Project>
-      <Name>OpenSim.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="physics\PhysicsManager.csproj">
-      <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
-      <Name>PhysicsManager</Name>
-    </ProjectReference>
-    <ProjectReference Include="RemoteServers\RemoteGridServers\RemoteGridServers.csproj">
-      <Project>{CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}</Project>
-      <Name>RemoteGridServers</Name>
-    </ProjectReference>
-    <ProjectReference Include="ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
deleted file mode 100644
index e6b64d6..0000000
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
-[assembly: AssemblyDescriptionAttribute("The default server console")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/ServerConsole/ServerConsole/ServerConsole.cs b/src/ServerConsole/ServerConsole/ServerConsole.cs
deleted file mode 100644
index 27d97e5..0000000
--- a/src/ServerConsole/ServerConsole/ServerConsole.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-namespace ServerConsole
-{
-        public class MainConsole {
-                
-                private static ConsoleBase instance;
-                
-                public static ConsoleBase Instance 
-                {
-                        get 
-                        {
-                                return instance;
-                        }
-                        set
-                        {
-                                instance = value;
-                        }
-                }
-    }
-        
-        public abstract class ConsoleBase
-        {
-                
-                public enum ConsoleType {
-                        Local,          // Use stdio
-                        TCP,            // Use TCP/telnet
-                        SimChat         // Use in-world chat (for gods)
-                }
-                public abstract void Close();
-        public abstract void Write(string format, params object[] args);
-        public abstract void WriteLine(string format, params object[] args);    
-            
-                public abstract string ReadLine();
-                public abstract int Read() ;
-                // Displays a command prompt and waits for the user to enter a string, then returns that string
-                public abstract string CmdPrompt(string prompt) ;
-                
-                // Displays a command prompt and returns a default value if the user simply presses enter
-                public abstract string CmdPrompt(string prompt, string defaultresponse);
-                // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
-                public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ;
-                
-                // Runs a command with a number of parameters
-                public abstract Object RunCmd(string Cmd, string[] cmdparams) ;
-                // Shows data about something
-                public abstract void ShowCommands(string ShowWhat) ;
-        
-                // Displays a prompt to the user and then runs the command they entered
-                public abstract void MainConsolePrompt() ;
-        public abstract void SetStatus( string status );
-    }
-}
diff --git a/src/ServerConsole/ServerConsole/ServerConsole.csproj b/src/ServerConsole/ServerConsole/ServerConsole.csproj
deleted file mode 100644
index d1094de..0000000
--- a/src/ServerConsole/ServerConsole/ServerConsole.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ServerConsole</RootNamespace>
-    <AssemblyName>ServerConsole</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ServerConsole.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/ServerConsole/default.build b/src/ServerConsole/default.build
deleted file mode 100644
index 0de930a..0000000
--- a/src/ServerConsole/default.build
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/ServerConsole.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="ServerConsole/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-serverconsole" />
-                        <attribute type="AssemblyDescriptionAttribute" value="The default server console" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references>
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                        </references>
-                        <sources basedir="ServerConsole/">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/Util.cs b/src/Util.cs
deleted file mode 100644
index 477390e..0000000
--- a/src/Util.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim
-{
-        /// <summary>
-        /// </summary>
-        /// 
-                public class Util
-                {
-                        public static ulong UIntsToLong(uint X, uint Y)
-                        {
-                                return Helpers.UIntsToLong(X,Y);
-                        }
-                        public Util()
-                        {
-                                
-                        }
-                }
-                
-        public class QueItem {
-                public QueItem()
-                {
-                }
-                public Packet Packet;
-                public bool Incoming;
-        }
-                /*  this is in IGridServer.cs, so there should be no reason for it to be here as well
-                public class agentcircuitdata
-                {
-                        public agentcircuitdata() { }
-                        public LLUUID AgentID;
-                        public LLUUID SessionID;
-                        public LLUUID SecureSessionID;
-                        public string firstname;
-                        public string lastname;
-                        public uint circuitcode;
-                }
-                */
-                
-        public class BlockingQueue< T > {
-                private Queue< T > _queue = new Queue< T >();
-                private object _queueSync = new object();
-                public void Enqueue(T value)
-                {
-                        lock(_queueSync)
-                        {
-                                _queue.Enqueue(value);
-                                Monitor.Pulse(_queueSync);
-                        }
-                }
-                public T Dequeue()
-                {
-                        lock(_queueSync)
-                        {
-                                if( _queue.Count < 1)
-                                        Monitor.Wait(_queueSync);
-                                return _queue.Dequeue();
-                        }
-                }
-        }
-}
diff --git a/src/opensim.sln b/src/opensim.sln
deleted file mode 100644
index c4be551..0000000
--- a/src/opensim.sln
+++ /dev/null
@@ -1,80 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridInterfaces", "GridInterfaces\GridInterfaces.csproj", "{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhysicsManager", "physics\PhysicsManager.csproj", "{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole\ServerConsole.csproj", "{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalGridServers", "LocalServers\LocalGridServers\LocalGridServers.csproj", "{D7F0395B-FADC-4936-80A0-D95AACE92F62}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteGridServers", "RemoteServers\RemoteGridServers\RemoteGridServers.csproj", "{CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimConfig", "Config\SimConfig\SimConfig.csproj", "{B063760D-DB8D-4F64-B6FE-335FAD1E650A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Db4LocalStorage", "LocalStorage\Db4LocalStorage\Db4LocalStorage.csproj", "{74784F23-B0FD-484C-82C1-96C0215733DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPhysicsplugin", "physics\plugins\BasicPhysicsplugin.csproj", "{52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealPhysXplugin", "physics\RealPhysX\RealPhysXplugin\RealPhysXplugin.csproj", "{56C1D214-F389-4228-921A-0A3A0712C159}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{407CE85B-628C-4788-9DBC-49BCEFC3A84F}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.Build.0 = Release|Any CPU
-                {5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}.Release|Any CPU.Build.0 = Release|Any CPU
-                {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}.Release|Any CPU.Build.0 = Release|Any CPU
-                {C9A6026D-8E0C-4FE4-8691-FB2A566AA245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {C9A6026D-8E0C-4FE4-8691-FB2A566AA245}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {C9A6026D-8E0C-4FE4-8691-FB2A566AA245}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {C9A6026D-8E0C-4FE4-8691-FB2A566AA245}.Release|Any CPU.Build.0 = Release|Any CPU
-                {D7F0395B-FADC-4936-80A0-D95AACE92F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {D7F0395B-FADC-4936-80A0-D95AACE92F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {D7F0395B-FADC-4936-80A0-D95AACE92F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {D7F0395B-FADC-4936-80A0-D95AACE92F62}.Release|Any CPU.Build.0 = Release|Any CPU
-                {CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {CF0E7E62-34F4-4AB2-BDBD-AFC63224A7E5}.Release|Any CPU.Build.0 = Release|Any CPU
-                {B063760D-DB8D-4F64-B6FE-335FAD1E650A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {B063760D-DB8D-4F64-B6FE-335FAD1E650A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {B063760D-DB8D-4F64-B6FE-335FAD1E650A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {B063760D-DB8D-4F64-B6FE-335FAD1E650A}.Release|Any CPU.Build.0 = Release|Any CPU
-                {74784F23-B0FD-484C-82C1-96C0215733DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {74784F23-B0FD-484C-82C1-96C0215733DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {74784F23-B0FD-484C-82C1-96C0215733DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {74784F23-B0FD-484C-82C1-96C0215733DC}.Release|Any CPU.Build.0 = Release|Any CPU
-                {52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}.Release|Any CPU.Build.0 = Release|Any CPU
-                {56C1D214-F389-4228-921A-0A3A0712C159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {56C1D214-F389-4228-921A-0A3A0712C159}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.Build.0 = Release|Any CPU
-                {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-EndGlobal
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
deleted file mode 100644
index c6a4efa..0000000
--- a/src/physics/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
-[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/physics/PhysicsManager.cs b/src/physics/PhysicsManager.cs
deleted file mode 100644
index 1fee628..0000000
--- a/src/physics/PhysicsManager.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-namespace PhysicsSystem
-{
-        /// <summary>
-        /// Description of MyClass.
-        /// </summary>
-        public class PhysicsManager
-        {
-                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
-                
-                public PhysicsManager()
-                {
-                        
-                }
-                
-                public PhysicsScene GetPhysicsScene(string engineName)
-                {
-                    if( String.IsNullOrEmpty( engineName ) )
-                    {
-                return new NullPhysicsScene();
-                    }
-                    if(_plugins.ContainsKey(engineName))
-                        {
-                                ServerConsole.MainConsole.Instance.WriteLine("creating "+engineName);
-                                return _plugins[engineName].GetScene();
-                        }
-                        else
-                        {
-                string error = String.Format("couldn't find physicsEngine: {0}", engineName);
-                                ServerConsole.MainConsole.Instance.WriteLine( error );
-                throw new ArgumentException( error );
-                        }
-                }
-                
-                public void LoadPlugins()
-                {
-                        string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
-                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-        
-                for(int i= 0; i<pluginFiles.Length; i++)
-                {
-                        this.AddPlugin(pluginFiles[i]);
-                }
-        }
-                
-                private void AddPlugin(string FileName)
-                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
-                                if (pluginType.IsPublic) 
-                                {
-                                        if (!pluginType.IsAbstract)  
-                                        {
-                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
-                                                
-                                                if (typeInterface != null)
-                                                {
-                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        plug.Init();
-                                                        this._plugins.Add(plug.GetName(),plug);
-                                                        
-                                                }       
-                                                
-                                                typeInterface = null;                   
-                                        }                               
-                                }                       
-                        }
-                        
-                        pluginAssembly = null; 
-                }
-        }
-        public interface IPhysicsPlugin
-        {
-                bool Init();
-                PhysicsScene GetScene();
-                string GetName();
-                void Dispose();
-        }
-        
-        public abstract class PhysicsScene
-        {
-        public static PhysicsScene Null
-        {
-            get
-            {                
-                return new NullPhysicsScene();
-            }
-        }
-        
-                public abstract PhysicsActor AddAvatar(PhysicsVector position);
-                
-                public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
-                
-                public abstract void Simulate(float timeStep);
-                
-                public abstract void GetResults();
-                
-                public abstract void SetTerrain(float[] heightMap);
-                
-                public abstract bool IsThreaded
-                {
-                        get;
-                }
-        }
-        
-    public class NullPhysicsScene : PhysicsScene
-    {
-        private static int m_workIndicator;
-        
-        public override PhysicsActor AddAvatar(PhysicsVector position)
-        {
-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddAvatar({0})", position );
-            return PhysicsActor.Null;
-        }
-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-        {
-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddPrim({0},{1})", position, size );
-            return PhysicsActor.Null;            
-        }
-        public override void Simulate(float timeStep)
-        {
-            m_workIndicator = ( m_workIndicator + 1 ) % 10;
-            ServerConsole.MainConsole.Instance.SetStatus( m_workIndicator.ToString() );
-        }
-        public override void GetResults()
-        {
-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()" );
-        }
-        public override void SetTerrain(float[] heightMap)
-        {
-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length );
-        }
-        public override bool IsThreaded
-        {
-            get { return false; }
-        }
-    }
-    
-        public abstract class PhysicsActor
-        {
-        public static readonly PhysicsActor Null = new NullPhysicsActor();
-            
-                public abstract PhysicsVector Position
-                {
-                        get;
-                        set;
-                }
-                
-                public abstract PhysicsVector Velocity
-                {
-                        get;
-                        set;
-                }
-                
-                public abstract PhysicsVector Acceleration
-                {
-                        get;
-                }
-                public abstract bool Flying
-                {
-                        get;
-                        set;
-                }
-                
-                public abstract void AddForce(PhysicsVector force);
-                
-                public abstract void SetMomentum(PhysicsVector momentum);
-        }
-    public class NullPhysicsActor : PhysicsActor
-    {
-        public override PhysicsVector Position
-        {
-            get
-            {
-                return PhysicsVector.Zero;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return PhysicsVector.Zero;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override PhysicsVector Acceleration
-        {
-            get { return PhysicsVector.Zero; }
-        }
-        public override bool Flying
-        {
-            get
-            {
-                return false;
-            }
-            set
-            {
-                return;
-            }
-        }
-        public override void AddForce(PhysicsVector force)
-        {
-            return;
-        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-            return;
-        }
-    }
-    public class PhysicsVector
-        {
-                public float X;
-                public float Y;
-                public float Z;
-                
-                public PhysicsVector()
-                {
-                        
-                }
-                
-                public PhysicsVector(float x, float y, float z)
-                {
-                        X = x;
-                        Y = y;
-                        Z = z;
-                }
-        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
-        }
-}
diff --git a/src/physics/PhysicsManager.csproj b/src/physics/PhysicsManager.csproj
deleted file mode 100644
index 3eadfe7..0000000
--- a/src/physics/PhysicsManager.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>PhysicsManager</RootNamespace>
-    <AssemblyName>PhysicsManager</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PhysicsManager.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ServerConsole\ServerConsole\ServerConsole.csproj">
-      <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project>
-      <Name>ServerConsole</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj b/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj
deleted file mode 100644
index 554df5e..0000000
--- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>RealPhysXplugin</RootNamespace>
-    <AssemblyName>RealPhysXplugin</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="PhysX_Wrapper_Dotnet">
-      <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RealPhysX.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\PhysicsManager.csproj">
-      <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
-      <Name>PhysicsManager</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/physics/default.build b/src/physics/default.build
deleted file mode 100644
index 01d2415..0000000
--- a/src/physics/default.build
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../bin/PhysicsManager.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../VERSION" property="svnver"/>
-        <asminfo output="AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager" />
-                        <attribute type="AssemblyDescriptionAttribute" value="Handles physics plugins" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="library" output="../../bin/PhysicsManager.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="ServerConsole.dll" />
-                        </references>
-                        <sources basedir="./">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
deleted file mode 100644
index 4cd5558..0000000
--- a/src/physics/plugins/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.0.240")]
-[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
-[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
-[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")]
diff --git a/src/physics/plugins/BasicPhysicsplugin.csproj b/src/physics/plugins/BasicPhysicsplugin.csproj
deleted file mode 100644
index b3f47d3..0000000
--- a/src/physics/plugins/BasicPhysicsplugin.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{52BCCE7B-69EA-4AC3-9DBC-D571B96C2EA1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BasicPhysicsplugin</RootNamespace>
-    <AssemblyName>BasicPhysicsplugin</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\Physics\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PhysXplugin.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PhysicsManager.csproj">
-      <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
-      <Name>PhysicsManager</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
-\ No newline at end of file
diff --git a/src/physics/plugins/default.build b/src/physics/plugins/default.build
deleted file mode 100644
index 66056a5..0000000
--- a/src/physics/plugins/default.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OpenSim" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-            <delete file="../../../bin/Physics/PhysXplugin.dll" failonerror="false" />
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../../../VERSION" property="svnver"/>
-        <asminfo output="AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager-physx" />
-                        <attribute type="AssemblyDescriptionAttribute" value="PhysX plugin for OpenSim" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <mkdir dir="../../../bin/Physics"/>
-        
-        <csc target="library" output="../../../bin/Physics/PhysXplugin.dll" debug="${debug}" verbose="true" warninglevel="4">
-                        <references basedir="../../../bin" failonempty="true">
-                                <include name="System.dll" />
-                                <include name="System.Xml.dll" />
-                                <include name="PhysicsManager.dll" />
-                        </references>
-                        <sources basedir="./">
-                                <include name="*.cs" />
-                        </sources>
-                </csc>
-        </target>
-</project>
diff --git a/src/world/Avatar.cs b/src/world/Avatar.cs
deleted file mode 100644
index facfeee..0000000
--- a/src/world/Avatar.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using PhysicsSystem;
-using Axiom.MathLib;
-namespace OpenSim.world
-{
-    public class Avatar : Entity
-    {
-        public static bool PhysicsEngineFlying;
-        public string firstname;
-        public string lastname;
-        public OpenSimClient ControllingClient;
-        private PhysicsActor _physActor;
-        private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
-                private bool updateflag;
-                private byte movementflag;
-                private List<NewForce> forcesList = new List<NewForce>();
-                private short _updateCount;
-                private Axiom.MathLib.Quaternion bodyRot;
-                
-        public Avatar(OpenSimClient TheClient) {
-                ServerConsole.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)");
-                ControllingClient=TheClient;
-                        position = new LLVector3(100.0f,100.0f,30.0f);
-                        position.Z = OpenSim_Main.local_world.LandMap[(int)position.Y * 256 + (int)position.X]+1;
-                }
-        
-        public PhysicsActor PhysActor
-        {
-                set
-                {
-                        this._physActor = value;
-                }
-        }
-                public override void addForces()
-                {
-                        lock(this.forcesList)
-                        {
-                                if(this.forcesList.Count>0)
-                                {
-                                        for(int i=0 ; i < this.forcesList.Count; i++)
-                                        {
-                                                NewForce force = this.forcesList[i];
-                                                PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
-                                                this._physActor.Velocity = phyVector;
-                                                this.updateflag = true;
-                                                this.velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this
-                                                // but as we are setting the velocity (rather than using real forces) at the moment it is okay.
-                                        }
-                                        for(int i=0 ; i < this.forcesList.Count; i++)
-                                        {
-                                                this.forcesList.RemoveAt(0);
-                                        }
-                                }
-                        }
-                }
-        
-        public override void update()
-        {
-                
-                if(this.updateflag)
-                {
-                        //need to send movement info
-                        //so create the improvedterseobjectupdate packet
-                        //use CreateTerseBlock()
-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
-                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                        terse.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle; // FIXME
-                        terse.RegionData.TimeDilation = 64096;
-                        terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                        terse.ObjectData[0] = terseBlock;
-                        foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                client.OutPacket(terse);
-                        }
-                        
-                        updateflag =false;
-                        //this._updateCount = 0;
-                }
-                else
-                {
-                        //if((movementflag & 1) !=0)
-                        //{
-                                _updateCount++;
-                                if(( (!PhysicsEngineFlying) && (_updateCount>3)) || (_updateCount>0))
-                                {
-                                        //It has been a while since last update was sent so lets send one.
-                                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
-                                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                                        terse.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle; // FIXME
-                                        terse.RegionData.TimeDilation = 64096;
-                                        terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                                        terse.ObjectData[0] = terseBlock;
-                                        foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                                client.OutPacket(terse);
-                                        }
-                                        _updateCount = 0;
-                                }
-                        //}
-                }
-        }
-        public static void SetupTemplate(string name)
-        {
-                int i = 0;
-                FileInfo fInfo = new FileInfo(name);
-                long numBytes = fInfo.Length;
-                FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
-                BinaryReader br = new BinaryReader(fStream);
-                byte [] data1 = br.ReadBytes((int)numBytes);
-                br.Close();
-                fStream.Close();
-                
-                libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
-                
-                System.Text.Encoding enc = System.Text.Encoding.ASCII;
-                libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
-                pos.X = 100f;
-                objdata.ID = 8880000;
-                objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
-                libsecondlife.LLVector3 pos2 = new LLVector3(100f,100f,23f);
-                //objdata.FullID=user.AgentID;
-                byte[] pb = pos.GetBytes();
-                Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
-                
-                Avatar.AvatarTemplate = objdata;
-        }
-        public void CompleteMovement(World RegionInfo) {
-                ServerConsole.MainConsole.Instance.WriteLine("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");
-                AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
-                mov.AgentData.SessionID = this.ControllingClient.SessionID;
-                mov.AgentData.AgentID = this.ControllingClient.AgentID;
-                mov.Data.RegionHandle = OpenSim_Main.cfg.RegionHandle;
-                // TODO - dynamicalise this stuff
-                mov.Data.Timestamp = 1172750370;
-                mov.Data.Position = new LLVector3(100f, 100f, 23f);
-                mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
-                
-                ControllingClient.OutPacket(mov);
-        }
-        public void SendInitialPosition() {
-                
-                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                //send a objectupdate packet with information about the clients avatar
-                ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-                objupdate.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle;
-                objupdate.RegionData.TimeDilation = 64096;
-                objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-                
-                objupdate.ObjectData[0] = AvatarTemplate;
-                //give this avatar object a local id and assign the user a name
-                objupdate.ObjectData[0].ID = this.localid;
-                objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
-                objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
-                
-                libsecondlife.LLVector3 pos2 = new LLVector3((float)this.position.X, (float)this.position.Y, (float)this.position.Z);
-                
-                byte[] pb = pos2.GetBytes();
-                
-                Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
-                OpenSim_Main.local_world._localNumber++;
-                
-                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) 
-                {
-                        client.OutPacket(objupdate);
-                        if(client.AgentID != ControllingClient.AgentID)
-                        {
-                                SendAppearanceToOtherAgent(client);
-                        }
-                }
-                //this.ControllingClient.OutPacket(objupdate);
-        }
-        
-        public void SendInitialAppearance() {
-                AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
-                aw.AgentData.AgentID = this.ControllingClient.AgentID;
-                aw.AgentData.SerialNum = 0;
-                aw.AgentData.SessionID = ControllingClient.SessionID;
-                
-                aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
-                AgentWearablesUpdatePacket.WearableDataBlock awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                awb.WearableType = (byte)0;
-                awb.AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-                awb.ItemID = LLUUID.Random();
-                aw.WearableData[0] = awb;
-                
-                for(int i=1; i<13; i++) 
-                {
-                        awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                        awb.WearableType = (byte)i;
-                        awb.AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
-                        awb.ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
-                        aw.WearableData[i] = awb;
-                }
-                
-                ControllingClient.OutPacket(aw);
-        }
-        
-        public ObjectUpdatePacket CreateUpdatePacket()
-        {
-                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                //send a objectupdate packet with information about the clients avatar
-                ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-                objupdate.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle;
-                objupdate.RegionData.TimeDilation = 64096;
-                objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-                
-                objupdate.ObjectData[0] = AvatarTemplate;
-                //give this avatar object a local id and assign the user a name
-                objupdate.ObjectData[0].ID = this.localid;
-                objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
-                objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
-                
-                libsecondlife.LLVector3 pos2 = new LLVector3((float)this._physActor.Position.X, (float)this._physActor.Position.Y, (float)this._physActor.Position.Z);
-                
-                byte[] pb = pos2.GetBytes();
-                
-                Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
-            return objupdate;
-        }
-        
-        public void SendAppearanceToOtherAgent(OpenSimClient userInfo)
-                {
-                        AvatarAppearancePacket avp = new AvatarAppearancePacket();
-                
-                        
-                        avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
-                        //avp.ObjectData.TextureEntry=this.avatar_template.TextureEntry;// br.ReadBytes((int)numBytes);
-                        
-                        LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-0000-000000000005"));
-                avp.ObjectData.TextureEntry = ntex.ToBytes();
-                        
-                        AvatarAppearancePacket.VisualParamBlock avblock = null;
-                        for(int i = 0; i < 218; i++)
-                        {
-                                avblock = new AvatarAppearancePacket.VisualParamBlock();
-                                avblock.ParamValue = (byte)100;
-                                avp.VisualParam[i] = avblock;
-                        }
-                        
-                        avp.Sender.IsTrial = false;
-                        avp.Sender.ID = ControllingClient.AgentID;
-                        userInfo.OutPacket(avp);
-                        
-                }
-        
-        public void HandleUpdate(AgentUpdatePacket pack) {
-                if(((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_FLY) !=0)
-                {
-                        this._physActor.Flying = true;
-                }
-                else
-                {
-                        this._physActor.Flying = false;
-                }
-                if(((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) !=0) {
-                        Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                        if(((movementflag & 1) ==0) || (q!= this.bodyRot))
-                        {
-                                //we should add a new force to the list
-                                // but for now we will deal with velocities
-                                NewForce newVelocity = new NewForce();
-                                Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
-                                Axiom.MathLib.Vector3 direc = q * v3;
-                                direc.Normalize();
-                                
-                                //work out velocity for sim physics system
-                                direc = direc * ((0.03f) * 128f);
-                                if(this._physActor.Flying)
-                                        direc *=2;
-                                
-                                newVelocity.X = direc.x;
-                                newVelocity.Y = direc.y;
-                                newVelocity.Z = direc.z;
-                                this.forcesList.Add(newVelocity);
-                                movementflag = 1;
-                                this.bodyRot = q;
-                        }
-                }
-                else if((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_UP_POS) !=0) &&(PhysicsEngineFlying)) {
-                        if(((movementflag & 2) ==0) && this._physActor.Flying)
-                        {
-                                //we should add a new force to the list
-                                // but for now we will deal with velocities
-                                NewForce newVelocity = new NewForce();
-                                Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, 1);
-                                Axiom.MathLib.Vector3 direc = v3;
-                                direc.Normalize();
-                                
-                                //work out velocity for sim physics system
-                                direc = direc * ((0.03f) * 128f *2);
-                                newVelocity.X = direc.x;
-                                newVelocity.Y = direc.y;
-                                newVelocity.Z = direc.z;
-                                this.forcesList.Add(newVelocity);
-                                movementflag = 2;
-                        }
-                }
-                else if((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_UP_NEG) !=0) && (PhysicsEngineFlying)) {
-                        if(((movementflag & 4) ==0) && this._physActor.Flying)
-                        {
-                                //we should add a new force to the list
-                                // but for now we will deal with velocities
-                                NewForce newVelocity = new NewForce();
-                                Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, -1);
-                                //Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                                Axiom.MathLib.Vector3 direc = v3;
-                                direc.Normalize();
-                                
-                                //work out velocity for sim physics system
-                                direc = direc * ((0.03f) * 128f *2);
-                                newVelocity.X = direc.x;
-                                newVelocity.Y = direc.y;
-                                newVelocity.Z = direc.z;
-                                this.forcesList.Add(newVelocity);
-                                movementflag = 4;
-                        }
-                }
-                else if(((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_NEG) !=0) {
-                        Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
-                        if(((movementflag & 8) ==0) || (q!= this.bodyRot))
-                        {
-                                //we should add a new force to the list
-                                // but for now we will deal with velocities
-                                NewForce newVelocity = new NewForce();
-                                Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
-                                Axiom.MathLib.Vector3 direc = q * v3;
-                                direc.Normalize();
-                                
-                                //work out velocity for sim physics system
-                                direc = direc * ((0.03f) * 128f);
-                                if(this._physActor.Flying)
-                                        direc *=2;
-                                
-                                newVelocity.X = direc.x;
-                                newVelocity.Y = direc.y;
-                                newVelocity.Z = direc.z;
-                                this.forcesList.Add(newVelocity);
-                                movementflag = 8;
-                                this.bodyRot = q;
-                        }
-                }
-                else
-                {
-                        if((movementflag) !=0)
-                        {
-                                NewForce newVelocity = new NewForce();
-                                newVelocity.X = 0;
-                                newVelocity.Y = 0;
-                                newVelocity.Z = 0;
-                                this.forcesList.Add(newVelocity);
-                                movementflag = 0;
-                        }
-                }
-        }
-        
-                //should be moved somewhere else
-        public void SendRegionHandshake(World RegionInfo) {
-                ServerConsole.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
-                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                RegionHandshakePacket handshake = new RegionHandshakePacket();
-                
-                ServerConsole.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
-                handshake.RegionInfo.BillableFactor = 0;
-                handshake.RegionInfo.IsEstateManager = false;
-                handshake.RegionInfo.TerrainHeightRange00 = 60;
-                handshake.RegionInfo.TerrainHeightRange01 = 60;
-                handshake.RegionInfo.TerrainHeightRange10 = 60;
-                handshake.RegionInfo.TerrainHeightRange11 = 60;
-                handshake.RegionInfo.TerrainStartHeight00 = 10;
-                handshake.RegionInfo.TerrainStartHeight01 = 10;
-                handshake.RegionInfo.TerrainStartHeight10 = 10;
-                handshake.RegionInfo.TerrainStartHeight11 = 10;
-                handshake.RegionInfo.SimAccess = 13;
-                handshake.RegionInfo.WaterHeight = 20;
-                handshake.RegionInfo.RegionFlags = 72458694;
-                handshake.RegionInfo.SimName = _enc.GetBytes(OpenSim_Main.cfg.RegionName + "\0");
-                handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
-                handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
-                handshake.RegionInfo.TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3");
-                handshake.RegionInfo.TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
-                handshake.RegionInfo.TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
-                handshake.RegionInfo.TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
-                handshake.RegionInfo.TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
-                handshake.RegionInfo.TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
-                handshake.RegionInfo.TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
-                handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
-                
-                ServerConsole.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
-                this.ControllingClient.OutPacket(handshake);
-        }
-                
-                public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
-                {
-                        byte[] bytes = new byte[60];
-                        int i=0;
-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-                        
-                        dat.TextureEntry = AvatarTemplate.TextureEntry;
-                        libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
-                        
-                        uint ID = this.localid;
-                        
-                        bytes[i++] = (byte)(ID % 256);
-                        bytes[i++] = (byte)((ID >> 8) % 256);
-                        bytes[i++] = (byte)((ID >> 16) % 256);
-                        bytes[i++] = (byte)((ID >> 24) % 256);
-                        bytes[i++] = 0;
-                        bytes[i++] = 1;
-                        i += 14;
-                        bytes[i++] = 128;
-                        bytes[i++] = 63;
-                        
-                        byte[] pb = pos2.GetBytes();
-                        Array.Copy(pb, 0, bytes, i, pb.Length);
-                        i += 12;
-                        ushort InternVelocityX;
-                        ushort InternVelocityY;
-                        ushort InternVelocityZ;
-                        
-                        Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);
-                        internDirec = internDirec /128.0f;
-                        internDirec.x += 1;
-                        internDirec.y += 1;
-                        internDirec.z += 1;
-                        
-                        InternVelocityX = (ushort)(32768 * internDirec.x);
-                        InternVelocityY = (ushort)(32768 * internDirec.y);
-                        InternVelocityZ = (ushort)(32768 * internDirec.z);
-                        
-                        ushort ac = 32767;
-                        bytes[i++] = (byte)(InternVelocityX % 256);
-                        bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
-                        bytes[i++] = (byte)(InternVelocityY % 256);
-                        bytes[i++] = (byte)((InternVelocityY>> 8) % 256);
-                        bytes[i++] = (byte)(InternVelocityZ % 256);
-                        bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
-                        
-                        //accel
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        //rot
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);   
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        //rotation vel
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);                   
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);   
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        dat.Data=bytes;
-                        return(dat);
-                }
-    }
-    
-    public class NewForce
-    {
-        public float X;
-        public float Y;
-        public float Z;
-        
-        public NewForce()
-        {
-                
-        }
-    }
-}
diff --git a/src/world/Primitive.cs b/src/world/Primitive.cs
deleted file mode 100644
index 6be33ef..0000000
--- a/src/world/Primitive.cs
+++ /dev/null
@@ -1,429 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.types;
-using libsecondlife;
-using libsecondlife.Packets;
-using GridInterfaces;
-using PhysicsSystem;
-namespace OpenSim.world
-{
-    public class Primitive : Entity
-    {
-        protected float mesh_cutbegin;
-        protected float mesh_cutend;
-        protected PrimData primData;
-        protected bool newPrimFlag;
-        protected bool updateFlag;
-        protected bool dirtyFlag;
-        private ObjectUpdatePacket OurPacket;
-        private PhysicsActor _physActor;
-        private bool physicsEnabled;
-       
-        public bool PhysicsEnabled
-        {
-                get
-                {
-                        return physicsEnabled;
-                }
-                set
-                {
-                        physicsEnabled = value;
-                }
-        }
-        public bool UpdateFlag
-        {
-                get
-                {
-                        return updateFlag;
-                }
-                set
-                {
-                        updateFlag = value;
-                }
-        }
-        public LLVector3 Scale
-        {
-                set
-                {
-                        this.primData.Scale = value;
-                        this.dirtyFlag = true;
-                }
-                get
-                {
-                        return this.primData.Scale;
-                }
-        }
-        public PhysicsActor PhysActor
-        {
-                set
-                {
-                        this._physActor = value;
-                }
-        }
-        
-        public Primitive()
-        {
-            mesh_cutbegin = 0.0f;
-            mesh_cutend = 1.0f;
-        }
-        public override Mesh getMesh()
-        {
-            Mesh mesh = new Mesh();
-            Triangle tri = new Triangle(
-                new Axiom.MathLib.Vector3(0.0f, 1.0f, 1.0f), 
-                new Axiom.MathLib.Vector3(1.0f, 0.0f, 1.0f), 
-                new Axiom.MathLib.Vector3(1.0f, 1.0f, 0.0f));
-            mesh.AddTri(tri);
-            mesh += base.getMesh();
-            return mesh;
-        }
-        
-        public void UpdatePosition( LLVector3 pos)
-        {
-                this.position = pos;
-                if(this._physActor != null && this.physicsEnabled)
-                {
-                        this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);
-                }
-                this.updateFlag = true;
-        }
-        
-        public override void update()
-        {
-                if(this.newPrimFlag)
-                {
-                        foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                client.OutPacket(OurPacket);
-                        }
-                        this.newPrimFlag = false;
-                }
-                else if(this.updateFlag)
-                {
-                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                        terse.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle; // FIXME
-                        terse.RegionData.TimeDilation = 64096;
-                        terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                        terse.ObjectData[0] = this.CreateImprovedBlock();
-                        foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                client.OutPacket(terse);
-                        }
-                        this.updateFlag = false;
-                }
-                else if(this.dirtyFlag)
-                {
-                        foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                UpdateClient(client);
-                        }
-                        this.dirtyFlag = false;
-                }
-                else
-                {
-                        if(this._physActor != null && this.physicsEnabled) 
-                        {
-                                ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
-                                terse.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle; // FIXME
-                                terse.RegionData.TimeDilation = 64096;
-                                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
-                                terse.ObjectData[0] = this.CreateImprovedBlock();
-                                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {
-                                        client.OutPacket(terse);
-                                }
-                        }
-                }
-        }
-        
-        public void UpdateClient(OpenSimClient RemoteClient)
-        {
-                
-                LLVector3 lPos; 
-                if( this._physActor != null && this.physicsEnabled)
-                {
-                        PhysicsVector pPos = this._physActor.Position; 
-                                lPos = new LLVector3( pPos.X, pPos.Y, pPos.Z);
-                }
-                else
-                {
-                        lPos = this.position;
-                }
-                        byte[] pb = lPos.GetBytes();
-                Array.Copy(pb, 0, OurPacket.ObjectData[0].ObjectData, 0, pb.Length);
-                
-                // OurPacket should be update with the follwing in updateShape() rather than having to do it here
-                OurPacket.ObjectData[0].OwnerID = this.primData.OwnerID;
-                OurPacket.ObjectData[0].PCode = this.primData.PCode;
-                OurPacket.ObjectData[0].PathBegin = this.primData.PathBegin;
-                OurPacket.ObjectData[0].PathEnd = this.primData.PathEnd;
-                OurPacket.ObjectData[0].PathScaleX = this.primData.PathScaleX;
-                OurPacket.ObjectData[0].PathScaleY = this.primData.PathScaleY;
-                OurPacket.ObjectData[0].PathShearX = this.primData.PathShearX;
-                OurPacket.ObjectData[0].PathShearY = this.primData.PathShearY;
-                OurPacket.ObjectData[0].PathSkew = this.primData.PathSkew;
-                OurPacket.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
-                OurPacket.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
-                OurPacket.ObjectData[0].Scale = this.primData.Scale;
-                OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve;
-                OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
-                OurPacket.ObjectData[0].ParentID = 0;
-                OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
-                //finish off copying rest of shape data
-                OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
-                OurPacket.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
-                OurPacket.ObjectData[0].PathTaperX = this.primData.PathTaperX;
-                OurPacket.ObjectData[0].PathTaperY = this.primData.PathTaperY;
-                OurPacket.ObjectData[0].PathTwist = this.primData.PathTwist;
-                OurPacket.ObjectData[0].PathTwistBegin= this.primData.PathTwistBegin;
-                
-                RemoteClient.OutPacket(OurPacket);
-        }
-        
-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
-        {
-                this.primData.PathBegin = addPacket.PathBegin;
-                this.primData.PathEnd = addPacket.PathEnd;
-                this.primData.PathScaleX = addPacket.PathScaleX;
-                this.primData.PathScaleY = addPacket.PathScaleY;
-                this.primData.PathShearX  = addPacket.PathShearX;
-                this.primData.PathShearY = addPacket.PathShearY;
-                this.primData.PathSkew = addPacket.PathSkew;
-                this.primData.ProfileBegin = addPacket.ProfileBegin;
-                this.primData.ProfileEnd = addPacket.ProfileEnd;
-                this.primData.PathCurve = addPacket.PathCurve;
-                this.primData.ProfileCurve = addPacket.ProfileCurve;
-                this.primData.ProfileHollow = addPacket.ProfileHollow;
-                this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
-                this.primData.PathRevolutions = addPacket.PathRevolutions;
-                this.primData.PathTaperX = addPacket.PathTaperX;
-                this.primData.PathTaperY = addPacket.PathTaperY;
-                this.primData.PathTwist = addPacket.PathTwist;
-                this.primData.PathTwistBegin =addPacket.PathTwistBegin;
-                this.dirtyFlag = true;
-        }
-        
-        public void CreateFromPacket( ObjectAddPacket addPacket, LLUUID agentID, uint localID)
-        {
-                ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-                objupdate.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle;
-                objupdate.RegionData.TimeDilation = 64096;
-                
-                objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-                PrimData PData = new PrimData();
-                this.primData = PData;
-                objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
-                objupdate.ObjectData[0].PSBlock = new byte[0];
-                objupdate.ObjectData[0].ExtraParams = new byte[1];
-                objupdate.ObjectData[0].MediaURL = new byte[0];
-                objupdate.ObjectData[0].NameValue = new byte[0];
-                objupdate.ObjectData[0].Text = new byte[0];
-                objupdate.ObjectData[0].TextColor = new byte[4];
-                objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0,0,0);
-                objupdate.ObjectData[0].JointPivot = new LLVector3(0,0,0);
-                objupdate.ObjectData[0].Material = 3;
-                objupdate.ObjectData[0].UpdateFlags=32+65536+131072+256+4+8+2048+524288+268435456;
-                objupdate.ObjectData[0].TextureAnim = new byte[0];
-                objupdate.ObjectData[0].Sound = LLUUID.Zero;
-                LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-                objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
-                objupdate.ObjectData[0].State = 0;
-                objupdate.ObjectData[0].Data = new byte[0];
-                PData.OwnerID = objupdate.ObjectData[0].OwnerID = agentID;
-                PData.PCode = objupdate.ObjectData[0].PCode = addPacket.ObjectData.PCode;
-                PData.PathBegin = objupdate.ObjectData[0].PathBegin = addPacket.ObjectData.PathBegin;
-                PData.PathEnd = objupdate.ObjectData[0].PathEnd = addPacket.ObjectData.PathEnd;
-                PData.PathScaleX = objupdate.ObjectData[0].PathScaleX = addPacket.ObjectData.PathScaleX;
-                PData.PathScaleY = objupdate.ObjectData[0].PathScaleY = addPacket.ObjectData.PathScaleY;
-                PData.PathShearX = objupdate.ObjectData[0].PathShearX = addPacket.ObjectData.PathShearX;
-                PData.PathShearY = objupdate.ObjectData[0].PathShearY = addPacket.ObjectData.PathShearY;
-                PData.PathSkew = objupdate.ObjectData[0].PathSkew = addPacket.ObjectData.PathSkew;
-                PData.ProfileBegin = objupdate.ObjectData[0].ProfileBegin = addPacket.ObjectData.ProfileBegin;
-                PData.ProfileEnd = objupdate.ObjectData[0].ProfileEnd = addPacket.ObjectData.ProfileEnd;
-                PData.Scale = objupdate.ObjectData[0].Scale = addPacket.ObjectData.Scale;
-                PData.PathCurve = objupdate.ObjectData[0].PathCurve = addPacket.ObjectData.PathCurve;
-                PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;
-                PData.ParentID = objupdate.ObjectData[0].ParentID = 0;
-                PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;
-                
-                PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
-                PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;
-                PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;
-                PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
-                PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
-                PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-                
-                //finish off copying rest of shape data
-                
-                objupdate.ObjectData[0].ID = (uint)(localID);
-                objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID- 702000).ToString("00000"));
-                objupdate.ObjectData[0].ObjectData = new byte[60];
-                objupdate.ObjectData[0].ObjectData[46] = 128;
-                objupdate.ObjectData[0].ObjectData[47] = 63;
-                LLVector3 pos1= addPacket.ObjectData.RayEnd;
-                //update position
-                byte[] pb = pos1.GetBytes();
-                Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
-                this.newPrimFlag = true;
-                this.uuid = objupdate.ObjectData[0].FullID;
-                this.localid = objupdate.ObjectData[0].ID;
-                this.position = pos1;
-                this.OurPacket = objupdate;
-        }
-        
-        public void CreateFromStorage(PrimData store)
-        {
-                //need to clean this up as it shares a lot of code with CreateFromPacket()
-                ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
-                objupdate.RegionData.RegionHandle = OpenSim_Main.cfg.RegionHandle;
-                objupdate.RegionData.TimeDilation = 64096;      
-                objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-                
-                this.primData = store;
-                objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
-                objupdate.ObjectData[0].PSBlock = new byte[0];
-                objupdate.ObjectData[0].ExtraParams = new byte[1];
-                objupdate.ObjectData[0].MediaURL = new byte[0];
-                objupdate.ObjectData[0].NameValue = new byte[0];
-                objupdate.ObjectData[0].Text = new byte[0];
-                objupdate.ObjectData[0].TextColor = new byte[4];
-                objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0,0,0);
-                objupdate.ObjectData[0].JointPivot = new LLVector3(0,0,0);
-                objupdate.ObjectData[0].Material = 3;
-                objupdate.ObjectData[0].UpdateFlags=32+65536+131072+256+4+8+2048+524288+268435456;
-                objupdate.ObjectData[0].TextureAnim = new byte[0];
-                objupdate.ObjectData[0].Sound = LLUUID.Zero;
-                LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-                objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
-                objupdate.ObjectData[0].State = 0;
-                objupdate.ObjectData[0].Data = new byte[0];
-                objupdate.ObjectData[0].OwnerID = this.primData.OwnerID;
-                objupdate.ObjectData[0].PCode = this.primData.PCode;
-                objupdate.ObjectData[0].PathBegin = this.primData.PathBegin;
-                objupdate.ObjectData[0].PathEnd = this.primData.PathEnd;
-                objupdate.ObjectData[0].PathScaleX = this.primData.PathScaleX;
-                objupdate.ObjectData[0].PathScaleY = this.primData.PathScaleY;
-                objupdate.ObjectData[0].PathShearX = this.primData.PathShearX;
-                objupdate.ObjectData[0].PathShearY = this.primData.PathShearY;
-                objupdate.ObjectData[0].PathSkew = this.primData.PathSkew;
-                objupdate.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
-                objupdate.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
-                objupdate.ObjectData[0].Scale = this.primData.Scale;
-                objupdate.ObjectData[0].PathCurve = this.primData.PathCurve;
-                objupdate.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
-                objupdate.ObjectData[0].ParentID = 0;
-                objupdate.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
-                //finish off copying rest of shape data
-                objupdate.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
-                objupdate.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
-                objupdate.ObjectData[0].PathTaperX = this.primData.PathTaperX;
-                objupdate.ObjectData[0].PathTaperY = this.primData.PathTaperY;
-                objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;
-                objupdate.ObjectData[0].PathTwistBegin= this.primData.PathTwistBegin;
-                
-                objupdate.ObjectData[0].ID = (uint)store.LocalID;
-                objupdate.ObjectData[0].FullID = store.FullID;
-                
-                objupdate.ObjectData[0].ObjectData = new byte[60];
-                objupdate.ObjectData[0].ObjectData[46] = 128;
-                objupdate.ObjectData[0].ObjectData[47] = 63;
-                LLVector3 pos1= store.Position;
-                //update position
-                byte[] pb = pos1.GetBytes();
-                Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
-                this.uuid = objupdate.ObjectData[0].FullID;
-                this.localid = objupdate.ObjectData[0].ID;
-                this.position = pos1;
-                this.OurPacket = objupdate;
-                
-        }
-        public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
-        {
-                uint ID = this.localid;
-                byte[] bytes = new byte[60];
-                        
-                        int i = 0;
-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-                        dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
-                        
-                        bytes[i++] = (byte)(ID % 256);
-                        bytes[i++] = (byte)((ID >> 8) % 256);
-                        bytes[i++] = (byte)((ID >> 16) % 256);
-                        bytes[i++] = (byte)((ID >> 24) % 256);
-                        bytes[i++]= 0;
-                        bytes[i++]= 0;
-                        
-                        LLVector3 lPos; 
-                if( this._physActor != null && this.physicsEnabled)
-                {
-                        PhysicsVector pPos = this._physActor.Position; 
-                                lPos = new LLVector3( pPos.X, pPos.Y, pPos.Z);
-                }
-                else
-                {
-                        lPos = this.position;
-                }
-                        byte[] pb = lPos.GetBytes();
-                        Array.Copy(pb, 0, bytes, i, pb.Length);
-                        i += 12;
-                        ushort ac = 32767;
-                        //vel
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        //accel
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        ushort rw, rx,ry,rz;
-                        rw = (ushort)(32768 * (this.rotation.w+1));
-                        rx = (ushort)(32768 * (this.rotation.x+1));
-                        ry = (ushort)(32768 * (this.rotation.y+1));
-                        rz = (ushort)(32768 * (this.rotation.z+1));
-                        
-                        //rot
-                        bytes[i++] = (byte)(rx % 256);
-                        bytes[i++] = (byte)((rx >> 8) % 256);
-                        bytes[i++] = (byte)(ry % 256);
-                        bytes[i++] = (byte)((ry >> 8) % 256);
-                        bytes[i++] = (byte)(rz % 256);
-                        bytes[i++] = (byte)((rz >> 8) % 256);
-                        bytes[i++] = (byte)(rw % 256);
-                        bytes[i++] = (byte)((rw >> 8) % 256);
-                        
-                        //rotation vel
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        bytes[i++] = (byte)(ac % 256);
-                        bytes[i++] = (byte)((ac >> 8) % 256);
-                        
-                        dat.Data=bytes;
-                        return dat;
-        }
-        
-        public override void BackUp()
-        {
-                
-                this.primData.FullID = this.uuid;
-                this.primData.LocalID = this.localid;
-                this.primData.Position = this.position;
-                this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z , this.rotation.w);
-                OpenSim_Main.local_world.localStorage.StorePrim(this.primData);
-        }
-    }
-    
-}