Merge branch 'master' into vehicles

150 files changed, 3402 insertions, 9910 deletions

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index f30a18b..ddc37ed 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -30,24 +30,36 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Mono.Addins;
+using Nini.Config;
 using OpenSim;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.ApplicationPlugins.RegionModulesController
 {
-    public class RegionModulesControllerPlugin : IRegionModulesController, IApplicationPlugin
+    public class RegionModulesControllerPlugin : IRegionModulesController,
+            IApplicationPlugin
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // Logger
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
-        private OpenSimBase m_openSim; // for getting the config
+        // Config access
+        private OpenSimBase m_openSim;
 
+        // Our name
         private string m_name;
 
-        private List<Type> m_nonSharedModules = new List<Type>();
-        private List<Type> m_sharedModules = new List<Type>();
+        // Internal lists to collect information about modules present
+        private List<TypeExtensionNode> m_nonSharedModules =
+                new List<TypeExtensionNode>();
+        private List<TypeExtensionNode> m_sharedModules =
+                new List<TypeExtensionNode>();
 
-        private List<ISharedRegionModule> m_sharedInstances = new List<ISharedRegionModule>();
+        // List of shared module instances, for adding to Scenes
+        private List<ISharedRegionModule> m_sharedInstances =
+                new List<ISharedRegionModule>();
 
 #region IApplicationPlugin implementation
 
@@ -57,40 +69,136 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             m_openSim = openSim;
             openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
 
+            // Who we are
             string id = AddinManager.CurrentAddin.Id;
-            int pos = id.LastIndexOf(".");
-            if (pos == -1) m_name = id;
-            else m_name = id.Substring(pos + 1);
 
-            //ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules");
-            // load all the (new) region-module classes
-            foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
+            // Make friendly name
+            int pos = id.LastIndexOf(".");
+            if (pos == -1)
+                m_name = id;
+            else
+                m_name = id.Substring(pos + 1);
+
+            // The [Modules] section in the ini file
+            IConfig modulesConfig =
+                    openSim.ConfigSource.Source.Configs["Modules"];
+            if (modulesConfig == null)
+                modulesConfig = openSim.ConfigSource.Source.AddConfig("Modules");
+
+            // Scan modules and load all that aren't disabled
+            foreach (TypeExtensionNode node in
+                    AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
             {
-                // TODO why does node.Type.isSubclassOf(typeof(ISharedRegionModule)) not work?
                 if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
                 {
+                    // Get the config string
+                    string moduleString =
+                            modulesConfig.GetString("Setup_" + node.Id, String.Empty);
+
+                    // We have a selector
+                    if (moduleString != String.Empty)
+                    {
+                        // Allow disabling modules even if they don't have
+                        // support for it
+                        if (moduleString == "disabled")
+                            continue;
+
+                        // Split off port, if present
+                        string[] moduleParts = moduleString.Split(new char[] {'/'}, 2);
+                        // Format is [port/][class]
+                        string className = moduleParts[0];
+                        if (moduleParts.Length > 1)
+                            className = moduleParts[1];
+
+                        // Match the class name if given
+                        if (className != String.Empty &&
+                                node.Type.ToString() != className)
+                            continue;
+                    }
+
                     m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
-                    m_sharedModules.Add(node.Type);
+                    m_sharedModules.Add(node);
                 }
                 else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
                 {
+                    // Get the config string
+                    string moduleString =
+                            modulesConfig.GetString("Setup_" + node.Id, String.Empty);
+
+                    // We have a selector
+                    if (moduleString != String.Empty)
+                    {
+                        // Allow disabling modules even if they don't have
+                        // support for it
+                        if (moduleString == "disabled")
+                            continue;
+
+                        // Split off port, if present
+                        string[] moduleParts = moduleString.Split(new char[] {'/'}, 2);
+                        // Format is [port/][class]
+                        string className = moduleParts[0];
+                        if (moduleParts.Length > 1)
+                            className = moduleParts[1];
+
+                        // Match the class name if given
+                        if (className != String.Empty &&
+                                node.Type.ToString() != className)
+                            continue;
+                    }
+
                     m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
-                    m_nonSharedModules.Add(node.Type);
+                    m_nonSharedModules.Add(node);
                 }
                 else
                     m_log.DebugFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
             }
 
-            // now we've got all the region-module classes loaded, create one instance of every ISharedRegionModule,
-            // initialize and postinitialize it. This Initialise we are in is called before LoadRegion.PostInitialise
-            // is called (which loads the regions), so we don't have any regions in the server yet.
-            foreach (Type type in m_sharedModules)
+            // Load and init the module. We try a constructor with a port
+            // if a port was given, fall back to one without if there is
+            // no port or the more specific constructor fails.
+            // This will be removed, so that any module capable of using a port
+            // must provide a constructor with a port in the future.
+            // For now, we do this so migration is easy.
+            //
+            foreach (TypeExtensionNode node in m_sharedModules)
             {
-                ISharedRegionModule module = (ISharedRegionModule)Activator.CreateInstance(type);
+                Object[] ctorArgs = new Object[] {(uint)0};
+
+                // Read the config again
+                string moduleString =
+                        modulesConfig.GetString("Setup_" + node.Id, String.Empty);
+
+                // Get the port number, if there is one
+                if (moduleString != String.Empty)
+                {
+                    // Get the port number from the string
+                    string[] moduleParts = moduleString.Split(new char[] {'/'},
+                            2);
+                    if (moduleParts.Length > 1)
+                        ctorArgs[0] = Convert.ToUInt32(moduleParts[0]);
+                }
+
+                // Try loading and initilaizing the module, using the
+                // port if appropriate
+                ISharedRegionModule module = null;
+
+                try
+                {
+                    module = (ISharedRegionModule)Activator.CreateInstance(
+                            node.Type, ctorArgs);
+                }
+                catch
+                {
+                    module = (ISharedRegionModule)Activator.CreateInstance(
+                            node.Type);
+                }
+
+                // OK, we're up and running
                 m_sharedInstances.Add(module);
                 module.Initialise(openSim.ConfigSource.Source);
             }
 
+            // Immediately run PostInitialise on shared modules
             foreach (ISharedRegionModule module in m_sharedInstances)
             {
                 module.PostInitialise();
@@ -105,6 +213,8 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
 
 #region IPlugin implementation
 
+        // We don't do that here
+        //
         public void Initialise ()
         {
             throw new System.NotImplementedException();
@@ -114,9 +224,11 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
 
 #region IDisposable implementation
 
+        // Cleanup
+        //
         public void Dispose ()
         {
-            // we expect that all regions have been removed already
+            // We expect that all regions have been removed already
             while (m_sharedInstances.Count > 0)
             {
                 m_sharedInstances[0].Close();
@@ -147,6 +259,11 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
 
 #region IRegionModulesController implementation
 
+        // The root of all evil.
+        // This is where we handle adding the modules to scenes when they
+        // load. This means that here we deal with replaceable interfaces,
+        // nonshared modules, etc.
+        //
         public void AddRegionToModules (Scene scene)
         {
             Dictionary<Type, ISharedRegionModule> deferredSharedModules =
@@ -154,12 +271,26 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             Dictionary<Type, INonSharedRegionModule> deferredNonSharedModules =
                     new Dictionary<Type, INonSharedRegionModule>();
 
+            // We need this to see if a module has already been loaded and
+            // has defined a replaceable interface. It's a generic call,
+            // so this can't be used directly. It will be used later
             Type s = scene.GetType();
             MethodInfo mi = s.GetMethod("RequestModuleInterface");
 
-            List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
+            // This will hold the shared modules we actually load
+            List<ISharedRegionModule> sharedlist =
+                    new List<ISharedRegionModule>();
+
+            // Iterate over the shared modules that have been loaded
+            // Add them to the new Scene
             foreach (ISharedRegionModule module in m_sharedInstances)
             {
+                // Here is where we check if a replaceable interface
+                // is defined. If it is, the module is checked against
+                // the interfaces already defined. If the interface is
+                // defined, we simply skip the module. Else, if the module
+                // defines a replaceable interface, we add it to the deferred
+                // list.
                 Type replaceableInterface = module.ReplaceableInterface;
                 if (replaceableInterface != null)
                 {
@@ -185,11 +316,41 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 sharedlist.Add(module);
             }
 
+            IConfig modulesConfig =
+                    m_openSim.ConfigSource.Source.Configs["Modules"];
+
+            // Scan for, and load, nonshared modules
             List<INonSharedRegionModule> list = new List<INonSharedRegionModule>();
-            foreach (Type type in m_nonSharedModules)
+            foreach (TypeExtensionNode node in m_nonSharedModules)
             {
-                INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
+                Object[] ctorArgs = new Object[] {0};
+
+                // Read the config
+                string moduleString =
+                        modulesConfig.GetString("Setup_" + node.Id, String.Empty);
 
+                // Get the port number, if there is one
+                if (moduleString != String.Empty)
+                {
+                    // Get the port number from the string
+                    string[] moduleParts = moduleString.Split(new char[] {'/'},
+                            2);
+                    if (moduleParts.Length > 1)
+                        ctorArgs[0] = Convert.ToUInt32(moduleParts[0]);
+                }
+
+                // Actually load it
+                INonSharedRegionModule module = null;
+                try
+                {
+                    module = (INonSharedRegionModule)Activator.CreateInstance(node.Type, ctorArgs);
+                }
+                catch
+                {
+                    module = (INonSharedRegionModule)Activator.CreateInstance(node.Type);
+                }
+
+                // Check for replaceable interfaces
                 Type replaceableInterface = module.ReplaceableInterface;
                 if (replaceableInterface != null)
                 {
@@ -209,11 +370,16 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 m_log.DebugFormat("[REGIONMODULE]: Adding scene {0} to non-shared module {1}",
                                   scene.RegionInfo.RegionName, module.Name);
 
+                // Initialise the module
                 module.Initialise(m_openSim.ConfigSource.Source);
 
                 list.Add(module);
             }
 
+            // Now add the modules that we found to the scene. If a module
+            // wishes to override a replaceable interface, it needs to
+            // register it in Initialise, so that the deferred module
+            // won't load.
             foreach (INonSharedRegionModule module in list)
             {
                 module.AddRegion(scene);
@@ -223,9 +389,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
             // Now all modules without a replaceable base interface are loaded
             // Replaceable modules have either been skipped, or omitted.
             // Now scan the deferred modules here
-
             foreach (ISharedRegionModule module in deferredSharedModules.Values)
             {
+                // Determine if the interface has been replaced
                 Type replaceableInterface = module.ReplaceableInterface;
                 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
 
@@ -238,15 +404,20 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 m_log.DebugFormat("[REGIONMODULE]: Adding scene {0} to shared module {1} (deferred)",
                                   scene.RegionInfo.RegionName, module.Name);
 
+                // Not replaced, load the module
                 module.AddRegion(scene);
                 scene.AddRegionModule(module.Name, module);
 
                 sharedlist.Add(module);
             }
 
-            List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();
+            // Same thing for nonshared modules, load them unless overridden
+            List<INonSharedRegionModule> deferredlist =
+                    new List<INonSharedRegionModule>();
+
             foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)
             {
+                // Check interface override
                 Type replaceableInterface = module.ReplaceableInterface;
                 if (replaceableInterface != null)
                 {
@@ -268,6 +439,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
                 deferredlist.Add(module);
             }
 
+            // Finally, load valid deferred modules
             foreach (INonSharedRegionModule module in deferredlist)
             {
                 module.AddRegion(scene);
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index 2da774f..ad67c44 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -50,8 +50,16 @@ namespace OpenSim.Client.Linden
     /// </summary>
     public class LLProxyLoginModule : ISharedRegionModule
     {
+        private uint m_port = 0;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public LLProxyLoginModule(uint port)
+        {
+            m_log.DebugFormat("[CLIENT]: LLProxyLoginModule port {0}", port);
+            m_port = port;
+        }
+
         protected bool RegionLoginsEnabled
         {
             get
@@ -148,8 +156,8 @@ namespace OpenSim.Client.Linden
         protected void AddHttpHandlers()
         {
             //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change?
-            MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser, false);
-            MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser, false);
+            MainServer.GetHttpServer(m_port).AddXmlRPCHandler("expect_user", ExpectUser, false);
+            MainServer.GetHttpServer(m_port).AddXmlRPCHandler("logoff_user", LogOffUser, false);
         }
 
         protected void AddScene(Scene scene)
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index bc02bc4..204603d 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -996,19 +996,19 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 position, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public void SendAvatarData(SendAvatarData data)
         {
             //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
-            UUID ownerID = avatarID;
-            MXPSendAvatarData(firstName + " " + lastName, ownerID, UUID.Zero, avatarID, avatarLocalID, position, rotation);
+            UUID ownerID = data.AvatarID;
+            MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation);
         }
 
-        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid)
+        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
             MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = localID;
-            me.Location =ToOmVector(position);
-            me.Orientation = ToOmQuaternion(rotation);
+            me.ObjectIndex = data.LocalID;
+            me.Location = ToOmVector(data.Position);
+            me.Orientation = ToOmQuaternion(data.Rotation);
 
             Session.Send(me);
         }
@@ -1028,23 +1028,24 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        public void SendPrimitiveToClient(SendPrimitiveData data)
         {
-            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags,text,color,parentID,particleSystem,clickAction,material,textureanim);
+            MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
+                data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
+                data.material, data.textureanim);
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material)
+        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
-            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags, text, color, parentID, particleSystem, clickAction, material, new byte[0]);
+            MovementEventMessage me = new MovementEventMessage();
+            me.ObjectIndex = data.LocalID;
+            me.Location = ToOmVector(data.Position);
+            me.Orientation = ToOmQuaternion(data.Rotation);
+            Session.Send(me);
         }
 
-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
+        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
-            MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = localID;
-            me.Location = ToOmVector(position);
-            me.Orientation = ToOmQuaternion(rotation);
-            Session.Send(me);
         }
 
         public void FlushPrimUpdates()
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index bd061e7..4a54c67 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -561,12 +561,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public void SendAvatarData(SendAvatarData data)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid)
+        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
             throw new System.NotImplementedException();
         }
@@ -586,17 +586,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        public void SendPrimitiveToClient(SendPrimitiveData data)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material)
+        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
+        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
             throw new System.NotImplementedException();
         }
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index fe0914b..801d6b9 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -68,12 +68,20 @@ namespace OpenSim.Data.MySQL
 
             // Clean dropped attachments
             //
-            MySqlCommand cmd = m_Connection.CreateCommand();
-            cmd.CommandText = "delete from prims, primshapes using prims " +
-                    "left join primshapes on prims.uuid = primshapes.uuid " +
-                    "where PCode = 9 and State <> 0";
-            ExecuteNonQuery(cmd);
-            cmd.Dispose();
+            try
+            {
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from prims, primshapes using prims " +
+                            "left join primshapes on prims.uuid = primshapes.uuid " +
+                            "where PCode = 9 and State <> 0";
+                    ExecuteNonQuery(cmd);
+                }
+            }
+            catch (MySqlException ex)
+            {
+                m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
+            }
         }
 
         private IDataReader ExecuteReader(MySqlCommand c)
@@ -395,25 +403,23 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
-            UUID lastGroupID = UUID.Zero;
+            const int ROWS_PER_QUERY = 5000;
+
+            Dictionary<UUID, SceneObjectPart> prims = new Dictionary<UUID, SceneObjectPart>(ROWS_PER_QUERY);
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
-            Dictionary<UUID, SceneObjectPart> prims = new Dictionary<UUID, SceneObjectPart>();
-            SceneObjectGroup grp = null;
+            int count = 0;
+
+            #region Prim Loading
 
             lock (m_Connection)
             {
                 using (MySqlCommand cmd = m_Connection.CreateCommand())
                 {
-                    cmd.CommandText = "select *, " +
-                        "case when prims.UUID = SceneGroupID " +
-                        "then 0 else 1 end as sort from prims " +
-                        "left join primshapes on prims.UUID = primshapes.UUID " +
-                        "where RegionUUID = ?RegionUUID " +
-                        "order by SceneGroupID asc, sort asc, LinkNumber asc";
-
-                    cmd.Parameters.AddWithValue("RegionUUID", regionUUID.ToString());
+                    cmd.CommandText =
+                        "SELECT * FROM prims LEFT JOIN primshapes ON prims.UUID = primshapes.UUID WHERE RegionUUID = ?RegionUUID";
+                    cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
                     using (IDataReader reader = ExecuteReader(cmd))
                     {
@@ -425,52 +431,61 @@ namespace OpenSim.Data.MySQL
                             else
                                 prim.Shape = BuildShape(reader);
 
-                            prims[prim.UUID] = prim;
+                            UUID parentID = new UUID(reader["SceneGroupID"].ToString());
+                            if (parentID != prim.UUID)
+                                prim.ParentUUID = parentID;
 
-                            UUID groupID = new UUID(reader["SceneGroupID"].ToString());
+                            prims[prim.UUID] = prim;
 
-                            if (groupID != lastGroupID) // New SOG
-                            {
-                                if (grp != null)
-                                    objects[grp.UUID] = grp;
+                            ++count;
+                            if (count % ROWS_PER_QUERY == 0)
+                                m_log.Debug("[REGION DB]: Loaded " + count + " prims...");
+                        }
+                    }
+                }
+            }
 
-                                lastGroupID = groupID;
+            #endregion Prim Loading
 
-                                // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
-                                // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
-                                // this case, force the UUID to be the same as the group UUID so that at least these can be
-                                // deleted (we need to change the UUID so that any other prims in the linkset can also be 
-                                // deleted).
-                                if (prim.UUID != groupID && groupID != UUID.Zero)
-                                {
-                                    m_log.WarnFormat(
-                                        "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID",
-                                        prim.Name, prim.UUID, prim.GroupPosition, groupID);
+            #region SceneObjectGroup Creation
 
-                                    prim.UUID = groupID;
-                                }
+            // Create all of the SOGs from the root prims first
+            foreach (SceneObjectPart prim in prims.Values)
+            {
+                if (prim.ParentUUID == UUID.Zero)
+                    objects[prim.UUID] = new SceneObjectGroup(prim);
+            }
 
-                                grp = new SceneObjectGroup(prim);
-                            }
-                            else
-                            {
-                                // Black magic to preserve link numbers
-                                //
-                                int link = prim.LinkNum;
+            // Add all of the children objects to the SOGs
+            foreach (SceneObjectPart prim in prims.Values)
+            {
+                SceneObjectGroup sog;
+                if (prim.UUID != prim.ParentUUID)
+                {
+                    if (objects.TryGetValue(prim.ParentUUID, out sog))
+                    {
+                        int originalLinkNum = prim.LinkNum;
 
-                                grp.AddPart(prim);
+                        sog.AddPart(prim);
 
-                                if (link != 0)
-                                    prim.LinkNum = link;
-                            }
-                        }
+                        // SceneObjectGroup.AddPart() tries to be smart and automatically set the LinkNum.
+                        // We override that here
+                        if (originalLinkNum != 0)
+                            prim.LinkNum = originalLinkNum;
+                    }
+                    else
+                    {
+                        m_log.Warn("[REGION DB]: Database contains an orphan child prim " + prim.UUID + " pointing to missing parent " + prim.ParentUUID);
                     }
-
-                    if (grp != null)
-                        objects[grp.UUID] = grp;
                 }
             }
 
+            #endregion SceneObjectGroup Creation
+
+            m_log.DebugFormat("[REGION DB]: Loaded {0} objects using {1} prims", objects.Count, prims.Count);
+
+            #region Prim Inventory Loading
+
             // Instead of attempting to LoadItems on every prim,
             // most of which probably have no items... get a 
             // list from DB of all prims which have items and
@@ -480,7 +495,7 @@ namespace OpenSim.Data.MySQL
             {
                 using (MySqlCommand itemCmd = m_Connection.CreateCommand())
                 {
-                    itemCmd.CommandText = "select distinct primID from primitems";
+                    itemCmd.CommandText = "SELECT DISTINCT primID FROM primitems";
                     using (IDataReader itemReader = ExecuteReader(itemCmd))
                     {
                         while (itemReader.Read())
@@ -489,9 +504,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 UUID primID = new UUID(itemReader["primID"].ToString());
                                 if (prims.ContainsKey(primID))
-                                {
                                     primsWithInventory.Add(prims[primID]);
-                                }
                             }
                         }
                     }
@@ -499,9 +512,14 @@ namespace OpenSim.Data.MySQL
             }
 
             foreach (SceneObjectPart prim in primsWithInventory)
+            {
                 LoadItems(prim);
+            }
+
+            #endregion Prim Inventory Loading
+
+            m_log.DebugFormat("[REGION DB]: Loaded inventory from {0} objects", primsWithInventory.Count);
 
-            m_log.DebugFormat("[REGION DB]: Loaded {0} objects using {1} prims", objects.Count, prims.Count);
             return new List<SceneObjectGroup>(objects.Values);
         }
 
@@ -798,137 +816,137 @@ namespace OpenSim.Data.MySQL
         private SceneObjectPart BuildPrim(IDataReader row)
         {
             SceneObjectPart prim = new SceneObjectPart();
-            prim.UUID = new UUID((String) row["UUID"]);
+            prim.UUID = new UUID((string)row["UUID"]);
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
-            prim.CreationDate = Convert.ToInt32(row["CreationDate"]);
+            prim.CreationDate = (int)row["CreationDate"];
             if (row["Name"] != DBNull.Value)
-                prim.Name = (String)row["Name"];
+                prim.Name = (string)row["Name"];
             else
-                prim.Name = string.Empty;
-            // various text fields
-            prim.Text = (String) row["Text"];
-            prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorA"]),
-                                        Convert.ToInt32(row["ColorR"]),
-                                        Convert.ToInt32(row["ColorG"]),
-                                        Convert.ToInt32(row["ColorB"]));
-            prim.Description = (String) row["Description"];
-            prim.SitName = (String) row["SitName"];
-            prim.TouchName = (String) row["TouchName"];
-            // permissions
-            prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
-            prim.CreatorID = new UUID((String) row["CreatorID"]);
-            prim.OwnerID = new UUID((String) row["OwnerID"]);
-            prim.GroupID = new UUID((String) row["GroupID"]);
-            prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
-            prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
-            prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
-            prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
-            prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
-            prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
-            // vectors
+                prim.Name = String.Empty;
+            // Various text fields
+            prim.Text = (string)row["Text"];
+            prim.Color = Color.FromArgb((int)row["ColorA"],
+                                        (int)row["ColorR"],
+                                        (int)row["ColorG"],
+                                        (int)row["ColorB"]);
+            prim.Description = (string)row["Description"];
+            prim.SitName = (string)row["SitName"];
+            prim.TouchName = (string)row["TouchName"];
+            // Permissions
+            prim.ObjectFlags = (uint)(int)row["ObjectFlags"];
+            prim.CreatorID = new UUID((string)row["CreatorID"]);
+            prim.OwnerID = new UUID((string)row["OwnerID"]);
+            prim.GroupID = new UUID((string)row["GroupID"]);
+            prim.LastOwnerID = new UUID((string)row["LastOwnerID"]);
+            prim.OwnerMask = (uint)(int)row["OwnerMask"];
+            prim.NextOwnerMask = (uint)(int)row["NextOwnerMask"];
+            prim.GroupMask = (uint)(int)row["GroupMask"];
+            prim.EveryoneMask = (uint)(int)row["EveryoneMask"];
+            prim.BaseMask = (uint)(int)row["BaseMask"];
+            // Vectors
             prim.OffsetPosition = new Vector3(
-                Convert.ToSingle(row["PositionX"]),
-                Convert.ToSingle(row["PositionY"]),
-                Convert.ToSingle(row["PositionZ"])
+                (float)(double)row["PositionX"],
+                (float)(double)row["PositionY"],
+                (float)(double)row["PositionZ"]
                 );
             prim.GroupPosition = new Vector3(
-                Convert.ToSingle(row["GroupPositionX"]),
-                Convert.ToSingle(row["GroupPositionY"]),
-                Convert.ToSingle(row["GroupPositionZ"])
+                (float)(double)row["GroupPositionX"],
+                (float)(double)row["GroupPositionY"],
+                (float)(double)row["GroupPositionZ"]
                 );
             prim.Velocity = new Vector3(
-                Convert.ToSingle(row["VelocityX"]),
-                Convert.ToSingle(row["VelocityY"]),
-                Convert.ToSingle(row["VelocityZ"])
+                (float)(double)row["VelocityX"],
+                (float)(double)row["VelocityY"],
+                (float)(double)row["VelocityZ"]
                 );
             prim.AngularVelocity = new Vector3(
-                Convert.ToSingle(row["AngularVelocityX"]),
-                Convert.ToSingle(row["AngularVelocityY"]),
-                Convert.ToSingle(row["AngularVelocityZ"])
+                (float)(double)row["AngularVelocityX"],
+                (float)(double)row["AngularVelocityY"],
+                (float)(double)row["AngularVelocityZ"]
                 );
             prim.Acceleration = new Vector3(
-                Convert.ToSingle(row["AccelerationX"]),
-                Convert.ToSingle(row["AccelerationY"]),
-                Convert.ToSingle(row["AccelerationZ"])
+                (float)(double)row["AccelerationX"],
+                (float)(double)row["AccelerationY"],
+                (float)(double)row["AccelerationZ"]
                 );
             // quaternions
             prim.RotationOffset = new Quaternion(
-                Convert.ToSingle(row["RotationX"]),
-                Convert.ToSingle(row["RotationY"]),
-                Convert.ToSingle(row["RotationZ"]),
-                Convert.ToSingle(row["RotationW"])
+                (float)(double)row["RotationX"],
+                (float)(double)row["RotationY"],
+                (float)(double)row["RotationZ"],
+                (float)(double)row["RotationW"]
                 );
             prim.SitTargetPositionLL = new Vector3(
-                Convert.ToSingle(row["SitTargetOffsetX"]),
-                Convert.ToSingle(row["SitTargetOffsetY"]),
-                Convert.ToSingle(row["SitTargetOffsetZ"])
+                (float)(double)row["SitTargetOffsetX"],
+                (float)(double)row["SitTargetOffsetY"],
+                (float)(double)row["SitTargetOffsetZ"]
                 );
             prim.SitTargetOrientationLL = new Quaternion(
-                Convert.ToSingle(row["SitTargetOrientX"]),
-                Convert.ToSingle(row["SitTargetOrientY"]),
-                Convert.ToSingle(row["SitTargetOrientZ"]),
-                Convert.ToSingle(row["SitTargetOrientW"])
+                (float)(double)row["SitTargetOrientX"],
+                (float)(double)row["SitTargetOrientY"],
+                (float)(double)row["SitTargetOrientZ"],
+                (float)(double)row["SitTargetOrientW"]
                 );
 
-            prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]);
-            prim.PayPrice[1] = Convert.ToInt32(row["PayButton1"]);
-            prim.PayPrice[2] = Convert.ToInt32(row["PayButton2"]);
-            prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
-            prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
+            prim.PayPrice[0] = (int)row["PayPrice"];
+            prim.PayPrice[1] = (int)row["PayButton1"];
+            prim.PayPrice[2] = (int)row["PayButton2"];
+            prim.PayPrice[3] = (int)row["PayButton3"];
+            prim.PayPrice[4] = (int)row["PayButton4"];
 
             prim.Sound = new UUID(row["LoopedSound"].ToString());
-            prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
+            prim.SoundGain = (float)(double)row["LoopedSoundGain"];
             prim.SoundFlags = 1; // If it's persisted at all, it's looped
 
             if (!(row["TextureAnimation"] is DBNull))
-                prim.TextureAnimation = (Byte[])row["TextureAnimation"];
+                prim.TextureAnimation = (byte[])row["TextureAnimation"];
             if (!(row["ParticleSystem"] is DBNull))
-                prim.ParticleSystem = (Byte[])row["ParticleSystem"];
+                prim.ParticleSystem = (byte[])row["ParticleSystem"];
 
             prim.RotationalVelocity = new Vector3(
-                Convert.ToSingle(row["OmegaX"]),
-                Convert.ToSingle(row["OmegaY"]),
-                Convert.ToSingle(row["OmegaZ"])
+                (float)(double)row["OmegaX"],
+                (float)(double)row["OmegaY"],
+                (float)(double)row["OmegaZ"]
                 );
 
             prim.SetCameraEyeOffset(new Vector3(
-                Convert.ToSingle(row["CameraEyeOffsetX"]),
-                Convert.ToSingle(row["CameraEyeOffsetY"]),
-                Convert.ToSingle(row["CameraEyeOffsetZ"])
+                (float)(double)row["CameraEyeOffsetX"],
+                (float)(double)row["CameraEyeOffsetY"],
+                (float)(double)row["CameraEyeOffsetZ"]
                 ));
 
             prim.SetCameraAtOffset(new Vector3(
-                Convert.ToSingle(row["CameraAtOffsetX"]),
-                Convert.ToSingle(row["CameraAtOffsetY"]),
-                Convert.ToSingle(row["CameraAtOffsetZ"])
+                (float)(double)row["CameraAtOffsetX"],
+                (float)(double)row["CameraAtOffsetY"],
+                (float)(double)row["CameraAtOffsetZ"]
                 ));
 
-            if (Convert.ToInt16(row["ForceMouselook"]) != 0)
+            if ((sbyte)row["ForceMouselook"] != 0)
                 prim.SetForceMouselook(true);
 
-            prim.ScriptAccessPin = Convert.ToInt32(row["ScriptAccessPin"]);
+            prim.ScriptAccessPin = (int)row["ScriptAccessPin"];
 
-            if (Convert.ToInt16(row["AllowedDrop"]) != 0)
+            if ((sbyte)row["AllowedDrop"] != 0)
                 prim.AllowedDrop = true;
 
-            if (Convert.ToInt16(row["DieAtEdge"]) != 0)
+            if ((sbyte)row["DieAtEdge"] != 0)
                 prim.DIE_AT_EDGE = true;
 
-            prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
-            prim.ObjectSaleType = unchecked((byte)Convert.ToSByte(row["SaleType"]));
+            prim.SalePrice = (int)row["SalePrice"];
+            prim.ObjectSaleType = unchecked((byte)(sbyte)row["SaleType"]);
 
-            prim.Material = unchecked((byte)Convert.ToSByte(row["Material"]));
+            prim.Material = unchecked((byte)(sbyte)row["Material"]);
 
             if (!(row["ClickAction"] is DBNull))
-                prim.ClickAction = unchecked((byte)Convert.ToSByte(row["ClickAction"]));
+                prim.ClickAction = unchecked((byte)(sbyte)row["ClickAction"]);
 
             prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
-            prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
+            prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
             
-            if (Convert.ToInt16(row["PassTouches"]) != 0)
+            if ((sbyte)row["PassTouches"] != 0)
                 prim.PassTouches = true;
-            prim.LinkNum = Convert.ToInt32(row["LinkNumber"]);
+            prim.LinkNum = (int)row["LinkNumber"];
 
             return prim;
         }
diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs
deleted file mode 100644
index 7ac2360..0000000
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using System.Drawing;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class ColorUserType : IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object color1, object color2)
-        {
-            return color1.Equals(color2);
-        }
-
-        public object DeepCopy(object color)
-        {
-            return color;
-        }
-
-        public object Disassemble(object color)
-        {
-            return color;
-        }
-
-        public int GetHashCode(object color)
-        {
-            return (color == null) ? 0 : color.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            Color color=Color.Empty;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                color = Color.FromArgb(rs.GetInt32(ord));
-            }
-
-            return color;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            Color color = (Color)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb();
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(Color); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/EstateRegionLink.cs b/OpenSim/Data/NHibernate/EstateRegionLink.cs
deleted file mode 100644
index 4b83fa5..0000000
--- a/OpenSim/Data/NHibernate/EstateRegionLink.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Data.NHibernate
-{
-    public class EstateRegionLink
-    {
-        private UUID estateRegionLinkID;
-        public UUID EstateRegionLinkID
-        {
-            get
-            {
-                return estateRegionLinkID;
-            }
-            set
-            {
-                estateRegionLinkID = value;
-            }
-        }
-
-        private uint estateID;
-        public uint EstateID
-        {
-            get
-            {
-                return estateID;
-            }
-            set
-            {
-                estateID = value;
-            }
-        }
-
-        private UUID regionID;
-        public UUID RegionID
-        {
-            get
-            {
-                return regionID;
-            }
-            set
-            {
-                regionID = value;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
deleted file mode 100644
index cf87827..0000000
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-using OpenMetaverse;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class QuaternionUserType: IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object quat1, object quat2)
-        {
-            return quat1.Equals(quat2);
-        }
-
-        public object DeepCopy(object quat)
-        {
-            Quaternion q = (Quaternion)quat;
-            return new Quaternion(q);
-        }
-
-        public object Disassemble(object quat)
-        {
-            return quat;
-        }
-
-        public int GetHashCode(object quat)
-        {
-            return (quat == null) ? 0 : quat.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object quat = null;
-
-            int x = rs.GetOrdinal(names[0]);
-            int y = rs.GetOrdinal(names[1]);
-            int z = rs.GetOrdinal(names[2]);
-            int w = rs.GetOrdinal(names[3]);
-            if (!rs.IsDBNull(x))
-            {
-                float X = (Single)Convert.ToDouble(rs[x].ToString());
-                float Y = (Single)Convert.ToDouble(rs[y].ToString());
-                float Z = (Single)Convert.ToDouble(rs[z].ToString());
-                float W = (Single)Convert.ToDouble(rs[w].ToString());
-                quat = new Quaternion(X, Y, Z, W);
-            }
-            return quat;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            Quaternion quat = (Quaternion)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = quat.X;
-            ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y;
-            ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z;
-            ((IDataParameter)cmd.Parameters[index + 3]).Value = quat.W;
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(Quaternion); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] {
-                    NHibernateUtil.Single.SqlType,
-                    NHibernateUtil.Single.SqlType,
-                    NHibernateUtil.Single.SqlType,
-                    NHibernateUtil.Single.SqlType
-                }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
deleted file mode 100644
index 8e652ff..0000000
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-using OpenMetaverse;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class UUIDUserType: IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object uuid1, object uuid2)
-        {
-            return uuid1.Equals(uuid2);
-        }
-
-        public object DeepCopy(object uuid)
-        {
-            return uuid;
-        }
-
-        public object Disassemble(object uuid)
-        {
-            return uuid;
-        }
-
-        public int GetHashCode(object uuid)
-        {
-            return (uuid == null) ? 0 : uuid.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object uuid = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                string first = (string)rs.GetString(ord);
-                uuid = new UUID(first);
-            }
-
-            return uuid;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            UUID uuid = (UUID)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(UUID); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.String.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
deleted file mode 100644
index 9fa4603..0000000
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-using OpenMetaverse;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class Vector3UserType: IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object vector1, object vector2)
-        {
-            return vector1.Equals(vector2);
-        }
-
-        public object DeepCopy(object vector)
-        {
-            return new Vector3((Vector3) vector);
-        }
-
-        public object Disassemble(object vector)
-        {
-            return vector;
-        }
-
-        public int GetHashCode(object vector)
-        {
-            return (vector == null) ? 0 : vector.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object vector = null;
-
-            int x = rs.GetOrdinal(names[0]);
-            int y = rs.GetOrdinal(names[1]);
-            int z = rs.GetOrdinal(names[2]);
-            if (!rs.IsDBNull(x) && !rs.IsDBNull(y) && !rs.IsDBNull(z))
-            {
-                float X = (Single)Convert.ToDouble(rs[x].ToString());
-                float Y = (Single)Convert.ToDouble(rs[y].ToString());
-                float Z = (Single)Convert.ToDouble(rs[z].ToString());
-                vector = new Vector3(X, Y, Z);
-            }
-            return vector;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            Vector3 vector = (Vector3)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = vector.X;
-            ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y;
-            ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z;
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(Vector3); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Migration/README.txt b/OpenSim/Data/NHibernate/Migration/README.txt
deleted file mode 100644
index 3776960..0000000
--- a/OpenSim/Data/NHibernate/Migration/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains migration scripts for migrating from other
-database backends in OpenSim to the NHibernate version of that same
-database driver.
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql b/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql
deleted file mode 100644
index 4a7e0d1..0000000
--- a/OpenSim/Data/NHibernate/Migration/SqliteAssets.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- The following converts the UUID from XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
--- to XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.  This puts it in Guid native format
--- for .NET, and the prefered format for LLUUID.
-
-update assets set UUID = SUBSTR(UUID,1,8) || "-" || SUBSTR(UUID,9,4) || "-" || SUBSTR(UUID,13,4)  || "-" || SUBSTR(UUID,17,4)  || "-" || SUBSTR(UUID,21,12) where UUID not like '%-%';
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl b/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl
deleted file mode 100755
index c59cbce..0000000
--- a/OpenSim/Data/NHibernate/Migration/SqliteInventory.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-
-# -- CREATE TABLE inventoryitems(UUID varchar(255) primary key,
-# -- assetID varchar(255),
-# -- assetType integer,
-# -- invType integer,
-# -- parentFolderID varchar(255),
-# -- avatarID varchar(255),
-# -- creatorsID varchar(255),
-# -- inventoryName varchar(255),
-# -- inventoryDescription varchar(255),
-# -- inventoryNextPermissions integer,
-# -- inventoryCurrentPermissions integer,
-# -- inventoryBasePermissions integer,
-# -- inventoryEveryOnePermissions integer);
-
-# -- CREATE TABLE inventoryfolders(UUID varchar(255) primary key,
-# -- name varchar(255),
-# -- agentID varchar(255),
-# -- parentID varchar(255),
-# -- type integer,
-# -- version integer);
-
-my $items = "INSERT INTO InventoryItems(ID, AssetID, AssetType, InvType, Folder, Owner, Creator, Name, Description, NextPermissions, CurrentPermissions, BasePermissions, EveryOnePermissions) ";
-my $folders = "INSERT INTO InventoryFolders(ID, Name, Owner, ParentID, Type, Version) ";
-
-open(SQLITE, "sqlite3 inventoryStore.db .dump |") or die "can't open the database for migration";
-open(WRITE,"| sqlite3 Inventory.db");
-
-while(my $line = <SQLITE>) {
-    $line =~ s/([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})/$1-$2-$3-$4-$5/g;
-    if($line =~ s/(INSERT INTO "inventoryitems")/$items/) {
-        print $line;
-        print WRITE $line;
-    }
-    if($line =~ s/(INSERT INTO "inventoryfolders")/$folders/) {
-        print $line;
-        print WRITE $line;
-    }    
-}
-
-close(WRITE);
-close(SQLITE);
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
deleted file mode 100644
index aaba15c..0000000
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using System.Collections.Generic;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-    /// <summary>
-    /// A User storage interface for the DB4o database system
-    /// </summary>
-    public class NHibernateAssetData : AssetDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        override public void Dispose() { }
-
-        public override void Initialise()
-        {
-            m_log.Info("[NHibernateGridData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        public override void Initialise(string connect)
-        {
-
-            m_log.InfoFormat("[NHIBERNATE] Initializing NHibernateAssetData");
-            manager = new NHibernateManager(connect, "AssetStore");
-
-        }
-
-        override public AssetBase GetAsset(UUID uuid)
-        {
-            return (AssetBase)manager.Get(typeof(AssetBase), uuid);
-        }
-
-        override public void StoreAsset(AssetBase asset)
-        {
-            AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.FullID);
-            if (temp == null)
-            {
-                m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
-                manager.Insert(asset);
-            }
-            else
-            {
-                m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
-                manager.Update(asset);
-            }
-        }
-
-        // private void LogAssetLoad(AssetBase asset)
-        // {
-        //     string temporary = asset.Temporary ? "Temporary" : "Stored";
-        //     string local = asset.Local ? "Local" : "Remote";
-
-        //     int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
-
-        //     m_log.Info("[SQLITE]: " +
-        //                              string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
-        //                                            asset.FullID, asset.Name, asset.Description, asset.Type,
-        //                                            asset.InvType, temporary, local, assetLength));
-        // }
-
-        override public bool ExistsAsset(UUID uuid)
-        {
-            m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
-            return (GetAsset(uuid) != null);
-        }
-
-        /// <summary>
-        /// Returns a list of AssetMetadata objects. The list is a subset of
-        /// the entire data set offset by <paramref name="start" /> containing
-        /// <paramref name="count" /> elements.
-        /// </summary>
-        /// <param name="start">The number of results to discard from the total data set.</param>
-        /// <param name="count">The number of rows the returned list should contain.</param>
-        /// <returns>A list of AssetMetadata objects.</returns>
-        public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
-        {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-            return retList;
-        }
-
-        public void DeleteAsset(UUID uuid)
-        {
-
-        }
-
-        public override string Name {
-            get { return "NHibernate"; }
-        }
-
-        public override string Version {
-            get { return "0.1"; }
-        }
-
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateEstateData.cs b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
deleted file mode 100644
index 5c5be9f..0000000
--- a/OpenSim/Data/NHibernate/NHibernateEstateData.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using NHibernate;
-using NHibernate.Criterion;
-using System.Collections;
-using System;
-
-namespace OpenSim.Data.NHibernate
-{
-    /// <summary>
-    /// A User storage interface for the DB4o database system
-    /// </summary>
-    public class NHibernateEstateData : IEstateDataStore
-    {
-
-        #region Fields
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        public string Name
-        {
-            get { return "NHibernateEstateData"; }
-        }
-
-        public string Version
-        {
-            get { return "0.1"; }
-        }
-
-        #endregion
-
-        #region Startup and shutdown.
-
-        public void Initialise()
-        {
-            m_log.Info("[NHIBERNATE]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        public void Initialise(string connect)
-        {
-
-            m_log.InfoFormat("[NHIBERNATE] Initializing " + Name + ".");
-            manager = new NHibernateManager(connect, "EstateStore");
-        }
-
-        public void Dispose() { }
-
-        #endregion
-
-        #region IEstateDataStore Members
-
-        public EstateSettings LoadEstateSettings(UUID regionID)
-        {
-            EstateRegionLink link = LoadEstateRegionLink(regionID);
-
-            // Ensure that estate settings exist for the link
-            if (link != null)
-            {
-                if (manager.GetWithStatefullSession(typeof(EstateSettings), link.EstateID) == null)
-                {
-                    // Delete broken link
-                    manager.Delete(link);
-                    link = null;
-                }
-            }
-
-            // If estate link does not exist create estate settings and link it to region.
-            if (link == null)
-            {
-                EstateSettings estateSettings = new EstateSettings();
-                //estateSettings.EstateOwner = UUID.Random();
-                //estateSettings.BlockDwell = false;
-                object identifier = manager.Insert(estateSettings);
-
-                if (identifier == null)
-                {
-                    // Saving failed. Error is logged in the manager.
-                    return null;
-                }
-
-                uint estateID = (uint)identifier;
-                link = new EstateRegionLink();
-                link.EstateRegionLinkID = UUID.Random();
-                link.RegionID = regionID;
-                link.EstateID = estateID;
-                manager.InsertWithStatefullSession(link);
-            }
-
-            // Load estate settings according to the existing or created link.
-            return (EstateSettings)manager.GetWithStatefullSession(typeof(EstateSettings), link.EstateID);
-        }
-
-        public void StoreEstateSettings(EstateSettings estateSettings)
-        {
-            // Estates are always updated when stored.
-            // Insert is always done via. load method as with the current API
-            // this is explicitly the only way to create region link.
-            manager.UpdateWithStatefullSession(estateSettings);
-        }
-
-        #endregion
-
-        #region Private Utility Methods
-        private EstateRegionLink LoadEstateRegionLink(UUID regionID)
-        {
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(EstateRegionLink));
-            criteria.Add(Expression.Eq("RegionID", regionID));
-            IList links = criteria.List();
-
-            // Fail fast if more than one estate links exist
-            if (links.Count > 1)
-            {
-                m_log.Error("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
-                throw new Exception("[NHIBERNATE]: Region had more than one estate linked: " + regionID);
-            }
-
-            if (links.Count == 1)
-            {
-                return (EstateRegionLink)links[0];
-            }
-            else
-            {
-                return null;
-            }
-        }
-        #endregion 
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
deleted file mode 100644
index 018af62..0000000
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using log4net;
-using NHibernate;
-using NHibernate.Criterion;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-
-    /// <summary>
-    /// A GridData Interface to the NHibernate database
-    /// </summary>
-    public class NHibernateGridData : GridDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        public override void Initialise()
-        {
-            m_log.Info("[NHibernateGridData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        public override void Initialise(string connect)
-        {
-            m_log.InfoFormat("[NHIBERNATE] Initializing NHibernateGridData");
-            manager = new NHibernateManager(connect, "GridStore");
-        }
-
-        /***********************************************************************
-         *
-         *  Public Interface Functions
-         *
-         **********************************************************************/
-
-        public override void Dispose() { }
-
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        public override string Name
-        {
-            get { return "NHibernate Grid Data Interface"; }
-        }
-
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        public override string Version
-        {
-            get
-            {
-                Module module = GetType().Module;
-                Version dllVersion = module.Assembly.GetName().Version;
-
-                return string.Format("{0}.{1}.{2}.{3}", 
-                    dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
-            }
-        }
-
-        public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-
-            RegionProfileData data = GetProfileByUUID(UUID);
-
-            return (regionHandle == data.regionHandle && simrecvkey == data.regionSecret);
-        }
-
-        public override ReservationData GetReservationAtPoint(uint x, uint y)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override DataResponse StoreProfile(RegionProfileData profile)
-        {
-            if (manager.Get(typeof(RegionProfileData), profile.Uuid) == null)
-            {
-                manager.Insert(profile);
-                return DataResponse.RESPONSE_OK;
-            }
-            else
-            {
-                manager.Update(profile);
-                return DataResponse.RESPONSE_OK;
-            }
-        }
-
-        public override DataResponse DeleteProfile(string uuid)
-        {
-            RegionProfileData regionProfileData = (RegionProfileData)manager.Get(typeof(RegionProfileData), new UUID(uuid));
-            if (regionProfileData != null)
-            {
-                manager.Delete(regionProfileData);
-                return DataResponse.RESPONSE_OK;
-            }
-            return DataResponse.RESPONSE_ERROR;
-        }
-
-        public override RegionProfileData GetProfileByUUID(UUID UUID)
-        {
-            return (RegionProfileData)manager.Get(typeof(RegionProfileData), UUID);
-        }
-
-        public override RegionProfileData GetProfileByHandle(ulong regionHandle)
-        {
-            using (ISession session = manager.GetSession())
-            {
-                ICriteria criteria = session.CreateCriteria(typeof(RegionProfileData));
-                criteria.Add(Expression.Eq("RegionHandle", regionHandle));
-
-                IList regions = criteria.List();
-
-                if (regions.Count == 1)
-                {
-                    return (RegionProfileData)regions[0];
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        public override RegionProfileData GetProfileByString(string regionName)
-        {
-
-            using (ISession session = manager.GetSession())
-            {
-                ICriteria criteria = session.CreateCriteria(typeof(RegionProfileData));
-                criteria.Add(Expression.Eq("RegionName", regionName));
-
-                IList regions = criteria.List();
-
-                if (regions.Count == 1)
-                {
-                    return (RegionProfileData)regions[0];
-                }
-                else
-                {
-                    return null;
-                }
-            }
-
-        }
-
-        public override RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax)
-        {
-            using (ISession session = manager.GetSession())
-            {
-                ICriteria criteria = session.CreateCriteria(typeof(RegionProfileData));
-                criteria.Add(Expression.Ge("RegionLocX", Xmin));
-                criteria.Add(Expression.Ge("RegionLocY", Ymin));
-                criteria.Add(Expression.Le("RegionLocX", Xmax));
-                criteria.Add(Expression.Le("RegionLocY", Ymax));
-
-                IList regions = criteria.List();
-                RegionProfileData[] regionArray = new RegionProfileData[regions.Count];
-
-                for (int i=0;i<regionArray.Length;i++)
-                {
-                    regionArray[i] = (RegionProfileData)regions[i];
-                }
-
-                return regionArray;
-            }
-        }
-
-        public override List<RegionProfileData> GetRegionsByName(string namePrefix, uint maxNum)
-        {
-            using (ISession session = manager.GetSession())
-            {
-                ICriteria criteria = session.CreateCriteria(typeof(RegionProfileData));
-                criteria.SetMaxResults((int)maxNum);
-
-                criteria.Add(Expression.Like("RegionName", namePrefix, MatchMode.Start));
-
-                IList regions = criteria.List();
-                List<RegionProfileData> regionList = new List<RegionProfileData>();
-
-                foreach (RegionProfileData regionProfileData in regions)
-                {
-                    regionList.Add(regionProfileData);
-                }
-
-                return regionList;
-            }
-        }
-
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
deleted file mode 100644
index 130be7e..0000000
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using log4net;
-using NHibernate;
-using NHibernate.Criterion;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-    public class NHibernateInventoryData: IInventoryDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        /// <summary>
-        /// The plugin being loaded
-        /// </summary>
-        /// <returns>A string containing the plugin name</returns>
-        public string Name
-        {
-            get { return "NHibernate Inventory Data Interface"; }
-        }
-
-        /// <summary>
-        /// The plugins version
-        /// </summary>
-        /// <returns>A string containing the plugin version</returns>
-        public string Version
-        {
-            get
-            {
-                Module module = GetType().Module;
-                // string dllName = module.Assembly.ManifestModule.Name;
-                Version dllVersion = module.Assembly.GetName().Version;
-
-
-                return
-                    string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
-                            dllVersion.Revision);
-            }
-        }
-
-        public void Initialise() 
-        { 
-            m_log.Info("[NHibernateInventoryData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        public void Initialise(string connect)
-        {
-            m_log.InfoFormat("[NHIBERNATE] Initializing NHibernateInventoryData");
-            manager = new NHibernateManager(connect, "InventoryStore");
-        }
-
-        /// <summary>
-        /// Closes the interface
-        /// </summary>
-        public void Dispose()
-        {
-        }
-
-        /*****************************************************************
-         *
-         *   Basic CRUD operations on Data
-         *
-         ****************************************************************/
-
-        // READ
-
-        /// <summary>
-        /// Returns an inventory item by its UUID
-        /// </summary>
-        /// <param name="item">The UUID of the item to be returned</param>
-        /// <returns>A class containing item information</returns>
-        public InventoryItemBase getInventoryItem(UUID item)
-        {
-            try
-            {
-                m_log.InfoFormat("[NHIBERNATE] getInventoryItem {0}", item);
-                return (InventoryItemBase)manager.Get(typeof(InventoryItemBase), item);
-            }
-            catch
-            {
-                m_log.ErrorFormat("Couldn't find inventory item: {0}", item);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new inventory item based on item
-        /// </summary>
-        /// <param name="item">The item to be created</param>
-        public void addInventoryItem(InventoryItemBase item)
-        {
-            if (!ExistsItem(item.ID))
-            {
-                manager.Insert(item);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add Inventory Item {0} that already exists, updating instead", item.ID);
-                updateInventoryItem(item);
-            }
-        }
-
-        /// <summary>
-        /// Updates an inventory item with item (updates based on ID)
-        /// </summary>
-        /// <param name="item">The updated item</param>
-        public void updateInventoryItem(InventoryItemBase item)
-        {
-            if (ExistsItem(item.ID))
-            {
-                manager.Update(item);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add Inventory Item {0} that already exists", item.ID);
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="item"></param>
-        public void deleteInventoryItem(UUID itemID)
-        {
-            InventoryItemBase item = (InventoryItemBase)manager.Get(typeof(InventoryItemBase), itemID);
-            if (item != null)
-            {
-                manager.Delete(item);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Error deleting InventoryItemBase {0}", itemID);
-            }
-            
-        }
-
-        public InventoryItemBase queryInventoryItem(UUID itemID)
-        {
-            return null;
-        }
-
-        public InventoryFolderBase queryInventoryFolder(UUID folderID)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns an inventory folder by its UUID
-        /// </summary>
-        /// <param name="folder">The UUID of the folder to be returned</param>
-        /// <returns>A class containing folder information</returns>
-        public InventoryFolderBase getInventoryFolder(UUID folder)
-        {
-            try
-            {
-                return (InventoryFolderBase)manager.Get(typeof(InventoryFolderBase), folder);
-            }
-            catch
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Couldn't find inventory item: {0}", folder);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new inventory folder based on folder
-        /// </summary>
-        /// <param name="folder">The folder to be created</param>
-        public void addInventoryFolder(InventoryFolderBase folder)
-        {
-            if (!ExistsFolder(folder.ID))
-            {
-                manager.Insert(folder);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add Inventory Folder {0} that already exists, updating instead", folder.ID);
-                updateInventoryFolder(folder);
-            }
-        }
-
-        /// <summary>
-        /// Updates an inventory folder with folder (updates based on ID)
-        /// </summary>
-        /// <param name="folder">The updated folder</param>
-        public void updateInventoryFolder(InventoryFolderBase folder)
-        {
-            if (ExistsFolder(folder.ID))
-            {
-                manager.Update(folder);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add Inventory Folder {0} that already exists", folder.ID);
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="folder"></param>
-        public void deleteInventoryFolder(UUID folderID)
-        {
-            InventoryFolderBase item = (InventoryFolderBase)manager.Get(typeof(InventoryFolderBase), folderID);
-            if (item != null)
-            {
-                manager.Delete(item);
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Error deleting InventoryFolderBase {0}", folderID);
-            }
-            manager.Delete(folderID);
-        }
-
-        // useful private methods
-        private bool ExistsItem(UUID uuid)
-        {
-            return (getInventoryItem(uuid) != null) ? true : false;
-        }
-
-        private bool ExistsFolder(UUID uuid)
-        {
-            return (getInventoryFolder(uuid) != null) ? true : false;
-        }
-
-        public void Shutdown()
-        {
-            // TODO: DataSet commit
-        }
-
-        // Move seems to be just update
-
-        public void moveInventoryFolder(InventoryFolderBase folder)
-        {
-            updateInventoryFolder(folder);
-        }
-
-        public void moveInventoryItem(InventoryItemBase item)
-        {
-            updateInventoryItem(item);
-        }
-
-
-
-        /// <summary>
-        /// Returns a list of inventory items contained within the specified folder
-        /// </summary>
-        /// <param name="folderID">The UUID of the target folder</param>
-        /// <returns>A List of InventoryItemBase items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
-        {
-            // try {
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(InventoryItemBase));
-            criteria.Add(Expression.Eq("Folder", folderID));
-            List<InventoryItemBase> list = new List<InventoryItemBase>();
-            foreach (InventoryItemBase item in criteria.List())
-            {
-                list.Add(item);
-            }
-            return list;
-            //                 }
-            //                 catch
-            //                 {
-            //                     return new List<InventoryItemBase>();
-            //                 }
-        }
-
-        public List<InventoryFolderBase> getUserRootFolders(UUID user)
-        {
-            return new List<InventoryFolderBase>();
-        }
-
-        // see InventoryItemBase.getUserRootFolder
-        public InventoryFolderBase getUserRootFolder(UUID user)
-        {
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(InventoryFolderBase));
-            criteria.Add(Expression.Eq("ParentID", UUID.Zero));
-            criteria.Add(Expression.Eq("Owner", user));
-            foreach (InventoryFolderBase folder in criteria.List())
-            {
-                return folder;
-            }
-            m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
-            return null;
-        }
-
-        /// <summary>
-        /// Append a list of all the child folders of a parent folder
-        /// </summary>
-        /// <param name="folders">list where folders will be appended</param>
-        /// <param name="parentID">ID of parent</param>
-        private void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
-        {
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(InventoryFolderBase));
-            criteria.Add(Expression.Eq("ParentID", parentID));
-            foreach (InventoryFolderBase item in criteria.List())
-            {
-                folders.Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of inventory folders contained in the folder 'parentID'
-        /// </summary>
-        /// <param name="parentID">The folder to get subfolders for</param>
-        /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
-        {
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            getInventoryFolders(ref folders, parentID);
-            return folders;
-        }
-
-        // See IInventoryDataPlugin
-        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
-        {
-            if (parentID == UUID.Zero)
-            {
-                // Zero UUID is not a real parent folder.
-                return new List<InventoryFolderBase>();
-            }
-
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            
-            getInventoryFolders(ref folders, parentID);
-
-            for (int i = 0; i < folders.Count; i++)
-                getInventoryFolders(ref folders, folders[i].ID);
-
-            return folders;
-        }
-
-        public List<InventoryItemBase> fetchActiveGestures (UUID avatarID)
-        {
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
deleted file mode 100644
index 2e7081e..0000000
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data.Common;
-using System.Reflection;
-using log4net;
-using NHibernate;
-using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
-using OpenMetaverse;
-using Environment=NHibernate.Cfg.Environment;
-
-namespace OpenSim.Data.NHibernate
-{
-    public class NHibernateManager
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private string dialect;
-        private Configuration configuration;
-        private ISessionFactory sessionFactory;
-
-        #region Initialization
-
-        /// <summary>
-        /// Initiate NHibernate Manager
-        /// </summary>
-        /// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param>
-        /// <param name="store">Name of the store</param>
-        public NHibernateManager(string connect, string store)
-        {
-            ParseConnectionString(connect);
-
-            //To create sql file uncomment code below and write the name of the file
-            //SchemaExport exp = new SchemaExport(cfg);
-            //exp.SetOutputFile("nameofthefile.sql");
-            //exp.Create(false, true); 
-
-            Assembly assembly = GetType().Assembly;
-
-            sessionFactory = configuration.BuildSessionFactory();
-            RunMigration(dialect, assembly, store);
-        }
-
-        /// <summary>
-        /// Initiate NHibernate Manager with spesific assembly
-        /// </summary>
-        /// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param>
-        /// <param name="store">Name of the store</param>
-        /// <param name="assembly">Outside assembly to be included </param>
-        public NHibernateManager(string connect, string store, Assembly assembly)
-        {
-            ParseConnectionString(connect);
-
-            configuration.AddAssembly(assembly);
-            sessionFactory = configuration.BuildSessionFactory();
-            RunMigration(dialect, assembly, store);
-        }
-
-        /// <summary>
-        /// Parses the connection string and creates the NHibernate configuration
-        /// </summary>
-        /// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param>
-        private void ParseConnectionString(string connect)
-        {
-            // Split out the dialect, driver, and connect string
-            char[] split = { ';' };
-            string[] parts = connect.Split(split, 3);
-            if (parts.Length != 3)
-            {
-                // TODO: make this a real exception type
-                throw new Exception("Malformed Inventory connection string '" + connect + "'");
-            }
-
-            dialect = parts[0];
-
-            // NHibernate setup
-            configuration = new Configuration();
-            configuration.SetProperty(Environment.ConnectionProvider,
-                            "NHibernate.Connection.DriverConnectionProvider");
-            configuration.SetProperty(Environment.Dialect,
-                            "NHibernate.Dialect." + dialect);
-            configuration.SetProperty(Environment.ConnectionDriver,
-                            "NHibernate.Driver." + parts[1]);
-            configuration.SetProperty(Environment.ConnectionString, parts[2]);
-            configuration.AddAssembly("OpenSim.Data.NHibernate");
-        }
-
-        /// <summary>
-        /// Runs migration for the the store in assembly
-        /// </summary>
-        /// <param name="dialect">Dialect in use</param>
-        /// <param name="assembly">Assembly where migration files exist</param>
-        /// <param name="store">Name of the store in use</param>
-        private void RunMigration(string dialect, Assembly assembly, string store)
-        {
-            // Migration subtype is the folder name under which migrations are stored. For mysql this folder is
-            // MySQLDialect instead of MySQL5Dialect which is the dialect currently in use. To avoid renaming 
-            // this folder each time the mysql version changes creating simple mapping:
-            String migrationSubType = dialect;
-            if (dialect.StartsWith("MySQL"))
-            {
-                migrationSubType = "MySQLDialect";
-            }
-
-            Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
-            migration.Update();
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Gets object of given type from database with given id. 
-        /// Uses stateless session for efficiency.
-        /// </summary>
-        /// <param name="type">Type of the object.</param>
-        /// <param name="id">Id of the object.</param>
-        /// <returns>The object or null if object was not found.</returns>
-        public object Get(Type type, Object id)
-        {
-            using (IStatelessSession session = sessionFactory.OpenStatelessSession())
-            {
-                object obj = null;
-                try
-                {
-                    obj = session.Get(type.FullName, id);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[NHIBERNATE] {0} of id {1} loading threw exception: " + e.ToString(), type.Name, id);
-                }
-                return obj;
-            }
-        }
-
-        /// <summary>
-        /// Gets object of given type from database with given id. 
-        /// Use this method for objects containing collections. For flat objects stateless mode is more efficient.
-        /// </summary>
-        /// <param name="type">Type of the object.</param>
-        /// <param name="id">Id of the object.</param>
-        /// <returns>The object or null if object was not found.</returns>
-        public object GetWithStatefullSession(Type type, Object id)
-        {
-            using (ISession session = sessionFactory.OpenSession())
-            {
-                object obj = null;
-                try
-                {
-                    obj = session.Get(type.FullName, id);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[NHIBERNATE] {0} of id {1} loading threw exception: " + e.ToString(), type.Name, id);
-                }
-                return obj;
-            }
-
-        }
-
-        /// <summary>
-        /// Inserts given object to database.
-        /// Uses stateless session for efficiency.
-        /// </summary>
-        /// <param name="obj">Object to be insterted.</param>
-        /// <returns>Identifier of the object. Useful for situations when NHibernate generates the identifier.</returns>
-        public object Insert(object obj)
-        {
-            try
-            {
-                using (IStatelessSession session = sessionFactory.OpenStatelessSession())
-                {
-                    using (ITransaction transaction=session.BeginTransaction())
-                    {
-                        Object identifier=session.Insert(obj);
-                        transaction.Commit();
-                        return identifier;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue inserting object ", e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Inserts given object to database.
-        /// Use this method for objects containing collections. For flat objects stateless mode is more efficient.
-        /// </summary>
-        /// <param name="obj">Object to be insterted.</param>
-        /// <returns>Identifier of the object. Useful for situations when NHibernate generates the identifier.</returns>
-        public object InsertWithStatefullSession(object obj)
-        {
-            try
-            {
-                using (ISession session = sessionFactory.OpenSession())
-                {
-                    using (ITransaction transaction = session.BeginTransaction())
-                    {
-                        Object identifier = session.Save(obj);
-                        transaction.Commit();
-                        return identifier;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue inserting object ", e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Updates given object to database.
-        /// Uses stateless session for efficiency.
-        /// </summary>
-        /// <param name="obj">Object to be updated.</param>
-        /// <returns>True if operation was succesful.</returns>
-        public bool Update(object obj)
-        {
-            try
-            {
-                using (IStatelessSession session = sessionFactory.OpenStatelessSession())
-                {
-                    using (ITransaction transaction = session.BeginTransaction())
-                    {
-                        session.Update(obj);
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue updating object ", e);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Updates given object to database.
-        /// Use this method for objects containing collections. For flat objects stateless mode is more efficient.
-        /// </summary>
-        /// <param name="obj">Object to be updated.</param>
-        /// <returns>True if operation was succesful.</returns>
-        public bool UpdateWithStatefullSession(object obj)
-        {
-            try
-            {
-                using (ISession session = sessionFactory.OpenSession())
-                {
-                    using (ITransaction transaction = session.BeginTransaction())
-                    {
-                        session.Update(obj);
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue updating object ", e);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Deletes given object from database.
-        /// </summary>
-        /// <param name="obj">Object to be deleted.</param>
-        /// <returns>True if operation was succesful.</returns>
-        public bool Delete(object obj)
-        {
-            try
-            {
-                using (IStatelessSession session = sessionFactory.OpenStatelessSession())
-                {
-                    using (ITransaction transaction = session.BeginTransaction())
-                    {
-                        session.Delete(obj);
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue deleting object ", e);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Returns statefull session which can be used to execute custom nhibernate or sql queries.
-        /// </summary>
-        /// <returns>Statefull session</returns>
-        public ISession GetSession()
-        {
-            return sessionFactory.OpenSession();
-        }
-
-        /// <summary>
-        /// Drops the database schema. This exist for unit tests. It should not be invoked from other than test teardown.
-        /// </summary>
-        public void DropSchema()
-        {
-            SchemaExport export = new SchemaExport(this.configuration);
-            export.Drop(true, true);
-
-            using (ISession session = sessionFactory.OpenSession())
-            {
-                ISQLQuery sqlQuery = session.CreateSQLQuery("drop table migrations");
-                sqlQuery.ExecuteUpdate();
-            }
-        }
-
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
deleted file mode 100644
index f19fda1..0000000
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using log4net;
-using NHibernate;
-using NHibernate.Criterion;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Data.NHibernate
-{
-    /// <summary>
-    /// A RegionData Interface to the NHibernate database
-    /// </summary>
-    public class NHibernateRegionData : IRegionDataStore
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        public void Initialise(string connect)
-        {
-            m_log.InfoFormat("[NHIBERNATE] Initializing NHibernateRegionData");
-            manager = new NHibernateManager(connect, "RegionStore");
-        }
-
-        /***********************************************************************
-         *
-         *  Public Interface Functions
-         *
-         **********************************************************************/
-
-        public void Dispose() {}
-
-        public void StoreRegionSettings(RegionSettings rs)
-        {
-            RegionSettings oldRegionSettings = (RegionSettings)manager.Get(typeof(RegionSettings), rs.RegionUUID);
-            if (oldRegionSettings != null)
-            {
-                manager.Update(rs);
-            }
-            else
-            {
-                manager.Insert(rs);
-            }
-        }
-
-        public RegionSettings LoadRegionSettings(UUID regionUUID)
-        {
-            RegionSettings regionSettings = (RegionSettings) manager.Get(typeof(RegionSettings), regionUUID);
-
-            if (regionSettings == null)
-            {
-                regionSettings = new RegionSettings();
-                regionSettings.RegionUUID = regionUUID;
-                manager.Insert(regionSettings);
-            }
-
-            regionSettings.OnSave += StoreRegionSettings;
-            
-            return regionSettings;
-        }
-
-        // This looks inefficient, but it turns out that it isn't
-        // based on trial runs with nhibernate 1.2
-        private void SaveOrUpdate(SceneObjectPart p)
-        {
-            try
-            {
-                SceneObjectPart old = (SceneObjectPart)manager.Get(typeof(SceneObjectPart), p.UUID);
-                if (old != null)
-                {
-                    m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID);
-                    manager.Update(p);
-                } 
-                else
-                {
-                    m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID);
-                    manager.Insert(p);
-                }
-                
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue saving part", e);
-            }
-        }
-
-        private void SaveOrUpdate(Terrain t)
-        {
-            try
-            {
-                
-                Terrain old = (Terrain)manager.Get(typeof(Terrain), t.RegionID);
-                if (old != null)
-                {
-                    m_log.InfoFormat("[NHIBERNATE] updating terrain {0}", t.RegionID);
-                    manager.Update(t);
-                }
-                else
-                {
-                    m_log.InfoFormat("[NHIBERNATE] saving terrain {0}", t.RegionID);
-                    manager.Insert(t);
-                }
-
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[NHIBERNATE] issue saving terrain", e);
-            }
-        }
-
-
-        /// <summary>
-        /// Adds an object into region storage
-        /// </summary>
-        /// <param name="obj">the object</param>
-        /// <param name="regionUUID">the region UUID</param>
-        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
-        {
-            uint flags = obj.RootPart.GetEffectiveObjectFlags();
-
-            // Eligibility check
-            if ((flags & (uint)PrimFlags.Temporary) != 0)
-                return;
-            if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
-                return;
-
-            try
-            {
-                foreach (SceneObjectPart part in obj.Children.Values)
-                {
-                    m_log.InfoFormat("Storing part {0}", part.UUID);
-                    SaveOrUpdate(part);
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("Can't save: ", e);
-            }
-        }
-
-        private SceneObjectGroup LoadObject(UUID uuid, UUID region)
-        {
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart));
-            criteria.Add(Expression.Eq("RegionID", region));
-            criteria.Add(Expression.Eq("ParentUUID", uuid));
-            criteria.AddOrder(Order.Asc("ParentID"));
-
-            IList<SceneObjectPart> parts = criteria.List<SceneObjectPart>();
-
-            SceneObjectGroup group = null;
-
-            // Find the root part
-            for (int i = 0; i < parts.Count; i++)
-            {
-                if (parts[i].UUID == uuid)
-                {
-                    group = new SceneObjectGroup(parts[i]);
-                    break;
-                }
-            }
-
-            // Add the children parts
-            if (group != null)
-            {
-                for (int i = 0; i < parts.Count; i++)
-                {
-                    if (parts[i].UUID != uuid)
-                        group.AddPart(parts[i]);
-                }
-            }
-            else
-            {
-                m_log.Error("[NHIBERNATE]: LoadObject() Attempted to load a SceneObjectGroup with no root SceneObjectPart ");
-            }
-
-            return group;
-        }
-
-        /// <summary>
-        /// Removes an object from region storage
-        /// </summary>
-        /// <param name="obj">the object</param>
-        /// <param name="regionUUID">the region UUID</param>
-        public void RemoveObject(UUID obj, UUID regionUUID)
-        {
-            SceneObjectGroup g = LoadObject(obj, regionUUID);
-            foreach (SceneObjectPart p in g.Children.Values)
-            {
-                manager.Delete(p);
-            }
-
-            // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
-
-        }
-
-        /// <summary>
-        /// Load persisted objects from region storage.
-        /// </summary>
-        /// <param name="regionUUID">The region UUID</param>
-        /// <returns>List of loaded groups</returns>
-        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
-        {
-            Dictionary<UUID, SceneObjectGroup> SOG = new Dictionary<UUID, SceneObjectGroup>();
-            List<SceneObjectGroup> ret = new List<SceneObjectGroup>();
-
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart));
-            criteria.Add(Expression.Eq("RegionID", regionUUID));
-            criteria.AddOrder(Order.Asc("ParentID"));
-            criteria.AddOrder(Order.Asc("LinkNum"));
-            foreach (SceneObjectPart p in criteria.List())
-            {
-                // root part
-                if (p.UUID == p.ParentUUID)
-                {
-                    SceneObjectGroup group = new SceneObjectGroup(p);
-                    SOG.Add(p.ParentUUID, group);
-                }
-                else
-                {
-                    SOG[p.ParentUUID].AddPart(p);
-                }
-                // get the inventory
-
-                ICriteria InvCriteria = manager.GetSession().CreateCriteria(typeof(TaskInventoryItem));
-                InvCriteria.Add(Expression.Eq("ParentPartID", p.UUID));
-                IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
-                foreach (TaskInventoryItem i in InvCriteria.List())
-                {
-                    inventory.Add(i);
-                }
-
-                if (inventory.Count > 0)
-                    p.Inventory.RestoreInventoryItems(inventory);
-            }
-            foreach (SceneObjectGroup g in SOG.Values)
-            {
-                ret.Add(g);
-            }
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Store a terrain revision in region storage
-        /// </summary>
-        /// <param name="ter">terrain heightfield</param>
-        /// <param name="regionID">region UUID</param>
-        public void StoreTerrain(double[,] ter, UUID regionID)
-        {
-            lock (this) {
-                Terrain t = new Terrain(regionID, ter);
-                SaveOrUpdate(t);
-            }
-        }
-
-        /// <summary>
-        /// Load the latest terrain revision from region storage
-        /// </summary>
-        /// <param name="regionID">the region UUID</param>
-        /// <returns>Heightfield data</returns>
-        public double[,] LoadTerrain(UUID regionID)
-        {
-            Terrain t = (Terrain)manager.Get(typeof(Terrain), regionID);
-            if (t != null)
-            {
-                return t.Doubles;
-            }
-               
-            m_log.Info("No terrain yet");
-            return null;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="globalID"></param>
-        public void RemoveLandObject(UUID globalID)
-        {
-
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="parcel"></param>
-        public void StoreLandObject(ILandObject parcel)
-        {
-
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="regionUUID"></param>
-        /// <returns></returns>
-        public List<LandData> LoadLandObjects(UUID regionUUID)
-        {
-            List<LandData> landDataForRegion = new List<LandData>();
-
-            return landDataForRegion;
-        }
-
-
-        /// <summary>
-        /// See <see cref="Commit"/>
-        /// </summary>
-        public void Shutdown()
-        {
-            //session.Flush();
-        }
-
-        /// <summary>
-        /// Load a region banlist
-        /// </summary>
-        /// <param name="regionUUID">the region UUID</param>
-        /// <returns>The banlist</returns>
-        public List<EstateBan> LoadRegionBanList(UUID regionUUID)
-        {
-            List<EstateBan> regionbanlist = new List<EstateBan>();
-
-            return regionbanlist;
-        }
-
-        /// <summary>
-        /// Add en entry into region banlist
-        /// </summary>
-        /// <param name="item"></param>
-        public void AddToRegionBanlist(EstateBan item)
-        {
-
-        }
-
-        /// <summary>
-        /// remove an entry from the region banlist
-        /// </summary>
-        /// <param name="item"></param>
-        public void RemoveFromRegionBanlist(EstateBan item)
-        {
-
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="val"></param>
-        /// <returns></returns>
-//        private static Array serializeTerrain(double[,] val)
-//        {
-//            MemoryStream str = new MemoryStream(65536*sizeof (double));
-//            BinaryWriter bw = new BinaryWriter(str);
-//
-//            // TODO: COMPATIBILITY - Add byte-order conversions
-//            for (int x = 0; x < (int)Constants.RegionSize; x++)
-//                for (int y = 0; y < (int)Constants.RegionSize; y++)
-//                    bw.Write(val[x, y]);
-//
-//            return str.ToArray();
-//        }
-
-        /// <summary>
-        /// see IRegionDatastore
-        /// </summary>
-        /// <param name="primID"></param>
-        /// <param name="items"></param>
-        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
-        {
-             ICriteria criteria = manager.GetSession().CreateCriteria(typeof(TaskInventoryItem));
-             criteria.Add(Expression.Eq("ParentPartID", primID));
-             try
-             {
-                 foreach (TaskInventoryItem i in criteria.List())
-                 {
-                     manager.Delete(i);
-                 }
-
-                 foreach (TaskInventoryItem i in items)
-                 {
-                     manager.Insert(i);
-
-                 }
-             }
-             catch (Exception e)
-             {
-                 m_log.Error("[NHIBERNATE] StoreInvetory", e);
-             }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
deleted file mode 100644
index 1b0c4c9..0000000
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Collections.Generic;
-using System.Reflection;
-using log4net;
-using NHibernate;
-using NHibernate.Criterion;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-    /// <summary>
-    /// A User storage interface for the DB4o database system
-    /// </summary>
-    public class NHibernateUserData : UserDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private NHibernateManager manager;
-        public NHibernateManager Manager
-        {
-            get
-            {
-                return manager;
-            }
-        }
-
-        public override void Initialise()
-        {
-            m_log.Info("[NHibernateUserData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        public override void Initialise(string connect)
-        {
-            m_log.InfoFormat("[NHIBERNATE] Initializing NHibernateUserData");
-            manager = new NHibernateManager(connect, "UserStore");
-        }
-
-        private bool ExistsUser(UUID uuid)
-        {
-            UserProfileData user = null;
-
-            m_log.InfoFormat("[NHIBERNATE] ExistsUser; {0}", uuid);
-            user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid);
-            
-            if (user == null)
-            {
-                m_log.InfoFormat("[NHIBERNATE] User with given UUID does not exist {0} ", uuid);
-                return false;
-            }
-
-            return true;
-
-        }
-
-        override public UserProfileData GetUserByUUID(UUID uuid)
-        {
-            UserProfileData user;
-            m_log.InfoFormat("[NHIBERNATE] GetUserByUUID: {0} ", uuid);
-            
-            user = (UserProfileData)manager.Get(typeof(UserProfileData), uuid);
-            if (user != null)
-            {
-                UserAgentData agent = GetAgentByUUID(uuid);
-                if (agent != null)
-                {
-                    user.CurrentAgent = agent;
-                }
-            }
-
-            return user;
-        }
-
-        override public void AddNewUserProfile(UserProfileData profile)
-        {
-            if (profile.ID == UUID.Zero)
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add User {0} {1} with zero UUID, throwintg exception as this is programming error ", profile.FirstName, profile.SurName);
-                return;
-            }
-
-            if (!ExistsUser(profile.ID))
-            {
-                m_log.InfoFormat("[NHIBERNATE] AddNewUserProfile {0}", profile.ID);
-                manager.Insert(profile);
-                // Agent should not be saved according to BasicUserTest.T015_UserPersistency()
-                // SetAgentData(profile.ID, profile.CurrentAgent);
-
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add User {0} {1} that already exists, updating instead", profile.FirstName, profile.SurName);
-                UpdateUserProfile(profile);
-            }
-        }
-
-        /*
-        private void SetAgentData(UUID uuid, UserAgentData agent)
-        {
-            UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid);
-            if (old != null)
-            {
-                m_log.InfoFormat("[NHIBERNATE] SetAgentData deleting old: {0} ",uuid);
-                manager.Delete(old);
-            }
-            if (agent != null)
-            {
-                m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID);
-                manager.Save(agent);
-            }
-        }
-        */
-        
-        override public bool UpdateUserProfile(UserProfileData profile)
-        {
-            if (ExistsUser(profile.ID))
-            {
-                manager.Update(profile);
-                // Agent should not be saved according to BasicUserTest.T015_UserPersistency()
-                // SetAgentData(profile.ID, profile.CurrentAgent);
-                return true;
-            }
-            else
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to update User {0} {1} that doesn't exist, updating instead", profile.FirstName, profile.SurName);
-                AddNewUserProfile(profile);
-                return true;
-            }
-        }
-
-        override public void AddNewUserAgent(UserAgentData agent)
-        {
-            if (agent.ProfileID == UUID.Zero)
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add new user agent with zero user id. Agent session id: {0}", agent.SessionID);
-                return;
-            }
-
-            if (agent.SessionID == UUID.Zero)
-            {
-                m_log.ErrorFormat("[NHIBERNATE] Attempted to add new user agent with zero session id. User profile id: {0}", agent.SessionID);
-                return;
-            }
-
-
-            UserAgentData old = (UserAgentData)manager.Get(typeof(UserAgentData), agent.ProfileID);
-            if (old != null)
-            {
-                manager.Delete(old);
-            }
-            
-            manager.Insert(agent);
-            
-        }
-
-        public void UpdateUserAgent(UserAgentData agent)
-        {
-            m_log.InfoFormat("[NHIBERNATE] UpdateUserAgent: {0} ", agent.ProfileID);
-            manager.Update(agent);
-        }
-
-        override public UserAgentData GetAgentByUUID(UUID uuid)
-        {
-            m_log.InfoFormat("[NHIBERNATE] GetAgentByUUID: {0} ", uuid);
-            return (UserAgentData)manager.Get(typeof(UserAgentData), uuid);
-        }
-
-        override public UserProfileData GetUserByName(string fname, string lname)
-        {
-            m_log.InfoFormat("[NHIBERNATE] GetUserByName: {0} {1} ", fname, lname);
-            ICriteria criteria = manager.GetSession().CreateCriteria(typeof(UserProfileData));
-            criteria.Add(Expression.Eq("FirstName", fname));
-            criteria.Add(Expression.Eq("SurName", lname));
-            foreach (UserProfileData profile in criteria.List())
-            {
-                profile.CurrentAgent = GetAgentByUUID(profile.ID);
-                return profile;
-            }
-            return null;
-        }
-
-        override public UserAgentData GetAgentByName(string fname, string lname)
-        {
-            return GetUserByName(fname, lname).CurrentAgent;
-        }
-
-        override public UserAgentData GetAgentByName(string name)
-        {
-            return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-
-        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>();
-            string[] querysplit;
-            querysplit = query.Split(' ');
-
-            if (querysplit.Length == 2)
-            {
-                ICriteria criteria = manager.GetSession().CreateCriteria(typeof(UserProfileData));
-                criteria.Add(Expression.Like("FirstName", querysplit[0]));
-                criteria.Add(Expression.Like("SurName", querysplit[1]));
-                foreach (UserProfileData profile in criteria.List())
-                {
-                    AvatarPickerAvatar user = new AvatarPickerAvatar();
-                    user.AvatarID = profile.ID;
-                    user.firstName = profile.FirstName;
-                    user.lastName = profile.SurName;
-                    results.Add(user);
-                }
-            }
-            return results;
-        }
-
-        // TODO: actually implement these
-        public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) 
-        {
-            UserProfileData user=GetUserByUUID(agentID);
-            user.WebLoginKey = webLoginKey;
-            UpdateUserProfile(user);
-            return;
-        }
-
-        public override void AddNewUserFriend(UUID ownerId, UUID friendId, uint perms) 
-        {
-            if (!FriendRelationExists(ownerId,friendId))
-            {
-                manager.Insert(new UserFriend(UUID.Random(), ownerId, friendId, perms));
-            }
-            if (!FriendRelationExists(friendId, ownerId))
-            {
-                manager.Insert(new UserFriend(UUID.Random(), friendId, ownerId, perms));
-            }
-            return;
-        }
-
-        private bool FriendRelationExists(UUID ownerId, UUID friendId)
-        {
-            using (ISession session = manager.GetSession())
-            {
-                ICriteria criteria = session.CreateCriteria(typeof(UserFriend));
-                criteria.Add(Expression.Eq("OwnerID", ownerId));
-                criteria.Add(Expression.Eq("FriendID", friendId));
-                return criteria.List().Count > 0;
-            }
-        }
-        
-        public override void RemoveUserFriend(UUID ownerId, UUID friendId) 
-        {
-            using (ISession session = manager.GetSession())
-            {
-                using (ITransaction transaction = session.BeginTransaction())
-                {
-
-                    {
-                        ICriteria criteria = session.CreateCriteria(typeof(UserFriend));
-                        criteria.Add(Expression.Eq("OwnerID", ownerId));
-                        criteria.Add(Expression.Eq("FriendID", friendId));
-
-                        foreach (UserFriend userFriend in criteria.List())
-                        {
-                            session.Delete(userFriend);
-                        }
-                    }
-
-                    {
-                        ICriteria criteria = session.CreateCriteria(typeof(UserFriend));
-                        criteria.Add(Expression.Eq("OwnerID", friendId));
-                        criteria.Add(Expression.Eq("FriendID", ownerId));
-
-                        foreach (UserFriend userFriend in criteria.List())
-                        {
-                            session.Delete(userFriend);
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            }
-            return; 
-        }
-
-
-        public override void UpdateUserFriendPerms(UUID ownerId, UUID friendId, uint perms) 
-        {
-            using (ISession session = manager.GetSession())
-            {
-                using (ITransaction transaction = session.BeginTransaction())
-                {
-                    {
-                        ICriteria criteria = session.CreateCriteria(typeof(UserFriend));
-                        criteria.Add(Expression.Eq("OwnerID", ownerId));
-                        criteria.Add(Expression.Eq("FriendID", friendId));
-
-                        foreach (UserFriend userFriend in criteria.List())
-                        {
-                            userFriend.FriendPermissions = perms;
-                            session.Update(userFriend);
-                        }
-                    }
-                    transaction.Commit();
-                }
-            }
-            return; 
-        }
-
-        public override List<FriendListItem> GetUserFriendList(UUID ownerId) 
-        {
-            List<FriendListItem> friendList=new List<FriendListItem>();
-            Dictionary<UUID, FriendListItem> friendListItemDictionary = new Dictionary<UUID, FriendListItem>();
-
-            using (ISession session = manager.GetSession())
-            {
-                    ICriteria criteria = session.CreateCriteria(typeof(UserFriend));
-                    criteria.Add(Expression.Or(
-                        Expression.Eq("OwnerID", ownerId),
-                        Expression.Eq("FriendID", ownerId)
-                        ));
-
-                    foreach (UserFriend userFriend in criteria.List())
-                    {
-                        if (userFriend.OwnerID == ownerId)
-                        {
-                            FriendListItem friendListItem = new FriendListItem();
-                            friendListItem.FriendListOwner = userFriend.OwnerID;
-                            friendListItem.Friend = userFriend.FriendID;
-                            friendListItem.FriendPerms = userFriend.FriendPermissions;
-                            friendListItemDictionary.Add(userFriend.FriendID, friendListItem);
-                            friendList.Add(friendListItem);
-                        }
-                    }
-
-                    // Reading permissions to other direction
-                    foreach (UserFriend userFriend in criteria.List())
-                    {
-                        if (userFriend.FriendID == ownerId)
-                        {
-                            //Ignore if there is no reverse relation existing.
-                            //if (friendListItemDictionary.ContainsKey(userFriend.OwnerID))
-                            {
-                                FriendListItem friendListItem = friendListItemDictionary[userFriend.OwnerID];
-                                friendListItem.FriendListOwnerPerms = userFriend.FriendPermissions;
-                            }
-                        }
-                    }
-
-            }
-
-            return friendList; 
-        }
-
-
-        public override Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> friendsIds) 
-        { 
-            Dictionary<UUID, FriendRegionInfo> friendRegionInfos=new Dictionary<UUID, FriendRegionInfo>();
-
-            foreach (UUID friendId in friendsIds)
-            {
-                UserAgentData agent=GetAgentByUUID(friendId);
-                if (agent != null)
-                {
-                    FriendRegionInfo fri = new FriendRegionInfo();
-                    fri.isOnline = agent.AgentOnline;
-                    fri.regionHandle = agent.Handle;
-
-                    friendRegionInfos[friendId] = fri;
-                }
-            }
-
-            return friendRegionInfos;
-        }
-
-        public override bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return true; }
-        public override bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return true; }
-
-        /// Appearance
-        /// TODO: stubs for now to get us to a compiling state gently
-        public override AvatarAppearance GetUserAppearance(UUID user)
-        {
-            return (AvatarAppearance)manager.Get(typeof(AvatarAppearance), user);
-        }
-
-        private bool ExistsAppearance(UUID uuid)
-        {
-            AvatarAppearance appearance = (AvatarAppearance)manager.Get(typeof(AvatarAppearance), uuid);
-            if (appearance == null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-
-        public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
-        {
-            if (appearance == null)
-                return;
-
-            appearance.Owner = user;
-
-            bool exists = ExistsAppearance(user);
-            if (exists)
-            {
-                manager.Update(appearance);
-            }
-            else
-            {
-                manager.Insert(appearance);
-            }
-        }
-
-        public override void ResetAttachments(UUID userID)
-        {
-        }
-
-        public override void LogoutUsers(UUID regionID)
-        {
-        }
-
-        public override string Name {
-            get { return "NHibernate"; }
-        }
-
-        public override string Version {
-            get { return "0.1"; }
-        }
-
-        public override void Dispose()
-        {
-
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
deleted file mode 100644
index cb8b36d..0000000
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
-        <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
-            <generator class="assigned" />
-        </id>
-        <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-        <property name="Name" type="String" length="64" />
-        <property name="Description" type="String" length="64" />
-        <property name="Local" type="boolean" />
-        <property name="Temporary" type="boolean" />
-        <property name="Data" type="binary" />
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml
deleted file mode 100644
index fd66910..0000000
--- a/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Data.NHibernate.EstateRegionLink, OpenSim.Data.NHibernate" table="EstateRegionLink" lazy="false">
-      <id name="EstateRegionLinkID" column="EstateRegionLinkID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-          <generator class="assigned" /> 
-        </id>
-
-        <property name="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-      
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
deleted file mode 100644
index d300b93..0000000
--- a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.EstateSettings, OpenSim.Framework" table="EstateSettings" lazy="false">
-        
-        <id name="EstateID" column="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"> 
-          <generator class="increment" /> 
-        </id>
-
-        <property name="ParentEstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="EstateOwner" column="EstateOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        
-        <property name="EstateName" column="Name" type="String" length="64" />
-
-        <property name="RedirectGridX" type="System.Int32" />
-        <property name="RedirectGridY" type="System.Int32" />
-
-        <property name="BillableFactor" type="System.Single" />
-        <property name="PricePerMeter" type="System.Int32" />                
-        <property name="SunPosition" type="System.Double" />
-
-        <property name="UseGlobalTime" type="System.Boolean" />
-        <property name="FixedSun" type="System.Boolean" />
-        <property name="AllowVoice" type="System.Boolean" />
-        <property name="AllowDirectTeleport" type="System.Boolean" />
-        <property name="ResetHomeOnTeleport" type="System.Boolean" />
-        <property name="PublicAccess" type="System.Boolean" />
-        <property name="DenyAnonymous" type="System.Boolean" />
-        <property name="DenyIdentified" type="System.Boolean" />
-        <property name="DenyTransacted" type="System.Boolean" />
-        <property name="DenyMinors" type="System.Boolean" />
-        <property name="BlockDwell" type="System.Boolean" />
-        <property name="EstateSkipScripts" type="System.Boolean" />
-        <property name="TaxFree" type="System.Boolean" />
-        <property name="AbuseEmailToEstateOwner" type="System.Boolean" />
-      
-        <property name="AbuseEmail" type="String" length="255" />
-
-        <array name="EstateManagers" table="EstateManagers" cascade="all">
-          <key column="EstateID" />
-          <index column="ArrayIndex" />
-          <element column="ManagerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        </array>
-
-        <array name="EstateAccess" table="EstateUsers" cascade="all">
-          <key column="EstateID" />
-          <index column="ArrayIndex" />
-          <element column="UserID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        </array>
-
-        <array name="EstateGroups" table="EstateGroups" cascade="all">
-          <key column="EstateID" />
-          <index column="ArrayIndex" />
-          <element column="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        </array>
-
-        <array name="EstateBans" table="EstateBans" cascade="all">
-          <key column="EstateID" />
-          <index column="ArrayIndex" />          
-          <composite-element class="OpenSim.Framework.EstateBan, OpenSim.Framework">
-            <property name="BannedUserID" column="BannedUserID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
-            <property name="BannedHostAddress" column="BannedHostAddress" type="String" length="16"/>
-            <property name="BannedHostIPMask" column="BannedHostIPMask" type="String" length="16"/>
-            <property name="BannedHostNameMask" column="BannedHostNameMask" type="String" length="16"/>
-          </composite-element>
-        </array>
-      
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
deleted file mode 100644
index c5f0115..0000000
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
-            <generator class="assigned" /> 
-        </id> 
-        <property name="Type" type="Int16" />
-        <property name="Version" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />
-        <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Name" type="String" length="64" />
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
deleted file mode 100644
index ea6032a..0000000
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id> 
-        <property name="InvType" type="System.Int32" />
-        <property name="AssetType" type="System.Int32" />
-        <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="CreatorId" type="string" column="Creator"/>
-        <property name="Name" type="String" length="64" />
-        <property name="Description" type="String" length="64" />
-        <property name="NextPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="CurrentPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="BasePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="EveryOnePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="GroupOwned" type="boolean" />
-        <property name="SalePrice" type="System.Int32" />
-        <property name="SaleType" type="System.Byte" />
-        <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="CreationDate" type="System.Int32" />
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt b/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt
deleted file mode 100644
index 1c89516..0000000
--- a/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-?This file describes the differences in schema creation and migration scripts.
-
-MySQL is used as reference script against which differences are listed.
-
-Generally MySQL create table options should be removed for other databases.
-
-_PostgreSQL_
-* DOUBLE->DOUBLE PRECISION
-* BIT->BOOLEAN
-
-_MsSql_
-* VARCHAR->NVARCHAR
-* Remove DEFAULT-keywords
-* DOUBLE->REAL
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
deleted file mode 100644
index deee78b..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_AssetStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-create table Assets (
-   ID NVARCHAR(36) not null,
-   Type SMALLINT null,
-   Name NVARCHAR(64) null,
-   Description NVARCHAR(64) null,
-   Local BIT null,
-   Temporary BIT null,
-   Data VARBINARY(max) null,
-   primary key (ID)
-)
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
deleted file mode 100644
index dd579f9..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
+++ /dev/null
@@ -1,72 +0,0 @@
-CREATE TABLE EstateSettings (
-  EstateID INT NOT NULL,
-  ParentEstateID INT NULL,
-  EstateOwnerID NVARCHAR(36) NULL,
-  Name NVARCHAR(64) NULL,
-  RedirectGridX INT NULL,
-  RedirectGridY INT NULL,
-  BillableFactor REAL NULL,
-  PricePerMeter INT NULL,
-  SunPosition FLOAT NULL,
-  
-  UseGlobalTime BIT NULL,
-  FixedSun BIT NULL,
-  AllowVoice BIT NULL,
-  AllowDirectTeleport BIT NULL,
-  ResetHomeOnTeleport BIT NULL,
-  PublicAccess BIT NULL,
-  DenyAnonymous BIT NULL,
-  DenyIdentified BIT NULL,
-  DenyTransacted BIT NULL,
-  DenyMinors BIT NULL,
-  BlockDwell BIT NULL,
-  EstateSkipScripts BIT NULL,
-  TaxFree BIT NULL,
-  AbuseEmailToEstateOwner BIT NULL,
-  
-  AbuseEmail NVARCHAR(255) NULL,
-
-  PRIMARY KEY (EstateID)
-);
-
-CREATE TABLE EstateRegionLink (
-  EstateRegionLinkID NVARCHAR(36) NOT NULL,
-  EstateID INT NULL,
-  RegionID NVARCHAR(36) NULL,
-  PRIMARY KEY (EstateRegionLinkID)
-);
-
-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
-
-
-CREATE TABLE EstateManagers (
-  EstateID INT NOT NULL,
-  ManagerID NVARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateUsers (
-  EstateID INT NOT NULL,
-  UserID NVARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateGroups (
-  EstateID INT NOT NULL,
-  GroupID NVARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateBans (
-  EstateID INT NOT NULL,
-  ArrayIndex INT NOT NULL,
-  BannedUserID NVARCHAR(36) NOT NULL,
-  BannedHostAddress NVARCHAR(16) NOT NULL,
-  BannedHostIPMask NVARCHAR(16) NOT NULL,
-  BannedHostNameMask NVARCHAR(16) NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql
deleted file mode 100644
index e4ad525..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-create table Regions (
-   Uuid NVARCHAR(36) not null,
-   RegionHandle BIGINT null,
-   RegionName NVARCHAR(32) null,
-   RegionRecvKey NVARCHAR(128) null,
-   RegionSendKey NVARCHAR(128) null,
-   RegionSecret NVARCHAR(128) null,
-   RegionDataURI NVARCHAR(255) null,
-   ServerIP NVARCHAR(64) null,
-   ServerPort INT null,
-   ServerURI NVARCHAR(255) null,
-   RegionLocX INT null,
-   RegionLocY INT null,
-   RegionLocZ INT null,
-   EastOverrideHandle BIGINT null,
-   WestOverrideHandle BIGINT null,
-   SouthOverrideHandle BIGINT null,
-   NorthOverrideHandle BIGINT null,
-   RegionAssetURI NVARCHAR(255) null,
-   RegionAssetRecvKey NVARCHAR(128) null,
-   RegionAssetSendKey NVARCHAR(128) null,
-   RegionUserURI NVARCHAR(255) null,
-   RegionUserRecvKey NVARCHAR(128) null,
-   RegionUserSendKey NVARCHAR(128) null,
-   ServerHttpPort INT null,
-   ServerRemotingPort INT null,
-   RegionMapTextureID NVARCHAR(36) null,
-   Owner_uuid NVARCHAR(36) null,
-   OriginUUID NVARCHAR(36) null,
-   primary key (Uuid)
-)
-create index region_handle on Regions (RegionHandle)
-create index region_name on Regions (RegionName)
-create index overrideHandles on Regions (EastOverrideHandle, WestOverrideHandle, SouthOverrideHandle, NorthOverrideHandle)
-
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql
deleted file mode 100644
index 82936c4..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_InventoryStore.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-create table InventoryFolders (
-  ID NVARCHAR(255) not null,
-   Type SMALLINT null,
-   Version INT null,
-   ParentID NVARCHAR(255) null,
-   Owner NVARCHAR(255) null,
-   Name NVARCHAR(64) null,
-   primary key (ID)
-)
-create table InventoryItems (
-  ID NVARCHAR(255) not null,
-   InvType INT null,
-   AssetType INT null,
-   AssetID NVARCHAR(255) null,
-   Folder NVARCHAR(255) null,
-   Owner NVARCHAR(255) null,
-   Creator NVARCHAR(255) null,
-   Name NVARCHAR(64) null,
-   Description NVARCHAR(64) null,
-   NextPermissions INT null,
-   CurrentPermissions INT null,
-   BasePermissions INT null,
-   EveryOnePermissions INT null,
-   GroupID NVARCHAR(255) null,
-   GroupOwned BIT null,
-   SalePrice INT null,
-   SaleType TINYINT null,
-   Flags INT null,
-   CreationDate INT null,
-   primary key (ID)
-)
-create index item_group_id on InventoryItems (GroupID)
-create index item_folder_id on InventoryItems (Folder)
-create index item_owner_id on InventoryItems (Owner)
-create index folder_owner_id on InventoryFolders (Owner)
-create index folder_parent_id on InventoryFolders (ParentID)
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql
deleted file mode 100644
index 181a74c..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql
+++ /dev/null
@@ -1,104 +0,0 @@
-create table Prims (
-  UUID NVARCHAR(255) not null,
-   ParentID INT null,
-   ParentUUID NVARCHAR(255) null,
-   RegionID NVARCHAR(255) null,
-   CreationDate INT null,
-   Name NVARCHAR(255) null,
-   Text NVARCHAR(255) null,
-   Description NVARCHAR(255) null,
-   SitName NVARCHAR(255) null,
-   TouchName NVARCHAR(255) null,
-   ObjectFlags INT null,
-   CreatorID NVARCHAR(255) null,
-   OwnerID NVARCHAR(255) null,
-   GroupID NVARCHAR(255) null,
-   LastOwnerID NVARCHAR(255) null,
-   OwnerMask INT null,
-   NextOwnerMask INT null,
-   GroupMask INT null,
-   EveryoneMask INT null,
-   BaseMask INT null,
-   PositionX REAL null,
-   PositionY REAL null,
-   PositionZ REAL null,
-   GroupPositionX REAL null,
-   GroupPositionY REAL null,
-   GroupPositionZ REAL null,
-   VelocityX REAL null,
-   VelocityY REAL null,
-   VelocityZ REAL null,
-   AngularVelocityX REAL null,
-   AngularVelocityY REAL null,
-   AngularVelocityZ REAL null,
-   AccelerationX REAL null,
-   AccelerationY REAL null,
-   AccelerationZ REAL null,
-   SitTargetOffsetX REAL null,
-   SitTargetOffsetY REAL null,
-   SitTargetOffsetZ REAL null,
-   RotationX REAL null,
-   RotationY REAL null,
-   RotationZ REAL null,
-   RotationW REAL null,
-   SitTargetOrientX REAL null,
-   SitTargetOrientY REAL null,
-   SitTargetOrientZ REAL null,
-   SitTargetOrientW REAL null,
-   ScaleX REAL null,
-   ScaleY REAL null,
-   ScaleZ REAL null,
-   PCode TINYINT null,
-   PathBegin INT null,
-   PathEnd INT null,
-   PathScaleX TINYINT null,
-   PathScaleY TINYINT null,
-   PathShearX TINYINT null,
-   PathShearY TINYINT null,
-   PathSkew TINYINT null,
-   PathCurve TINYINT null,
-   PathRadiusOffset TINYINT null,
-   PathRevolutions TINYINT null,
-   PathTaperX TINYINT null,
-   PathTaperY TINYINT null,
-   PathTwist TINYINT null,
-   ProfileBegin INT null,
-   ProfileEnd INT null,
-   ProfileCurve TINYINT null,
-   ProfileHollow INT null,
-   Texture VARBINARY(8000) null,
-   ExtraParams VARBINARY(8000) null,
-   State TINYINT null,
-   primary key (UUID)
-)
-
-create table PrimItems (
-  ItemID NVARCHAR(255) not null,
-   PrimID NVARCHAR(255) null,
-   AssetID NVARCHAR(255) null,
-   ParentFolderID NVARCHAR(255) null,
-   CreatorID NVARCHAR(255) null,
-   OwnerID NVARCHAR(255) null,
-   GroupID NVARCHAR(255) null,
-   LastOwnerID NVARCHAR(255) null,
-   CurrentPermissions INT null,
-   BasePermissions INT null,
-   EveryonePermissions INT null,
-   GroupPermissions INT null,
-   NextPermissions INT null,
-   Name NVARCHAR(255) null,
-   Description NVARCHAR(255) null,
-   CreationDate INT null,
-   Flags INT null,
-   Type INT null,
-   InvType INT null,
-   primary key (ItemID)
-)
-
-create table Terrain (
-   RegionID NVARCHAR(255) not null,
-   MapData VARBINARY(max) null,
-   primary key (RegionID)
-)
-
-
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql
deleted file mode 100644
index c9c6c89..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_UserStore.sql
+++ /dev/null
@@ -1,77 +0,0 @@
-create table UserAgents (
-  ProfileID NVARCHAR(255) not null,
-   AgentIP NVARCHAR(24) null,
-   AgentPort INT null,
-   AgentOnline BIT null,
-   SessionID NVARCHAR(255) null,
-   SecureSessionID NVARCHAR(255) null,
-   InitialRegion NVARCHAR(255) null,
-   Region NVARCHAR(255) null,
-   LoginTime INT null,
-   LogoutTime INT null,
-   Handle BIGINT null,
-   primary key (ProfileID)
-)
-
-create table UserProfiles (
-  ID NVARCHAR(255) not null,
-   FirstName NVARCHAR(32) null,
-   SurName NVARCHAR(32) null,
-   PasswordHash NVARCHAR(32) null,
-   PasswordSalt NVARCHAR(32) null,
-   WebLoginKey NVARCHAR(255) null,
-   HomeRegionX INT null,
-   HomeRegionY INT null,
-   HomeLocationX REAL null,
-   HomeLocationY REAL null,
-   HomeLocationZ REAL null,
-   HomeLookAtX REAL null,
-   HomeLookAtY REAL null,
-   HomeLookAtZ REAL null,
-   Created INT null,
-   LastLogin INT null,
-   RootInventoryFolderID NVARCHAR(255) null,
-   UserInventoryURI NVARCHAR(255) null,
-   UserAssetURI NVARCHAR(255) null,
-   Image NVARCHAR(255) null,
-   FirstLifeImage NVARCHAR(255) null,
-   AboutText NVARCHAR(255) null,
-   FirstLifeAboutText NVARCHAR(255) null,
-   primary key (ID)
-)
-create table UserAppearances (
-  Owner NVARCHAR(255) not null,
-   BodyItem NVARCHAR(255) null,
-   BodyAsset NVARCHAR(255) null,
-   SkinItem NVARCHAR(255) null,
-   SkinAsset NVARCHAR(255) null,
-   HairItem NVARCHAR(255) null,
-   HairAsset NVARCHAR(255) null,
-   EyesItem NVARCHAR(255) null,
-   EyesAsset NVARCHAR(255) null,
-   ShirtItem NVARCHAR(255) null,
-   ShirtAsset NVARCHAR(255) null,
-   PantsItem NVARCHAR(255) null,
-   PantsAsset NVARCHAR(255) null,
-   ShoesItem NVARCHAR(255) null,
-   ShoesAsset NVARCHAR(255) null,
-   SocksItem NVARCHAR(255) null,
-   SocksAsset NVARCHAR(255) null,
-   JacketItem NVARCHAR(255) null,
-   JacketAsset NVARCHAR(255) null,
-   GlovesItem NVARCHAR(255) null,
-   GlovesAsset NVARCHAR(255) null,
-   UnderShirtItem NVARCHAR(255) null,
-   UnderShirtAsset NVARCHAR(255) null,
-   UnderPantsItem NVARCHAR(255) null,
-   UnderPantsAsset NVARCHAR(255) null,
-   SkirtItem NVARCHAR(255) null,
-   SkirtAsset NVARCHAR(255) null,
-   Texture VARBINARY(8000) null,
-   VisualParams VARBINARY(8000) null,
-   Serial INT null,
-   primary key (Owner)
-)
-
-create index user_surname on UserProfiles (SurName)
-create index user_firstname on UserProfiles (FirstName)
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql
deleted file mode 100644
index dfaac6e..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-ALTER TABLE Prims ADD LinkNum INT null;
-ALTER TABLE Prims ADD Material TINYINT null;
-ALTER TABLE Prims ADD ScriptAccessPin INT null;
-ALTER TABLE Prims ADD TextureAnimation VARBINARY(max) null;
-ALTER TABLE Prims ADD ParticleSystem VARBINARY(max) null;
-ALTER TABLE Prims ADD ClickAction TINYINT null;
-ALTER TABLE Prims ADD Color INT null;
-
-CREATE TABLE RegionSettings
-(
-        RegionID NVARCHAR(255) NOT NULL,
-        BlockTerraform  bit NOT NULL,
-        BlockFly  bit NOT NULL,
-        AllowDamage  bit NOT NULL,
-        RestrictPushing  bit NOT NULL,
-        AllowLandResell  bit NOT NULL,
-        AllowLandJoinDivide  bit NOT NULL,
-        BlockShowInSearch  bit NOT NULL,
-        AgentLimit  int NOT NULL,
-        ObjectBonus  float(53) NOT NULL,
-        Maturity  int NOT NULL,
-        DisableScripts  bit NOT NULL,
-        DisableCollisions  bit NOT NULL,
-        DisablePhysics  bit NOT NULL,
-        TerrainTexture1  NVARCHAR(36) NOT NULL,
-        TerrainTexture2  NVARCHAR(36) NOT NULL,
-        TerrainTexture3  NVARCHAR(36) NOT NULL,
-        TerrainTexture4  NVARCHAR(36) NOT NULL,
-        Elevation1NW  float(53) NOT NULL,
-        Elevation2NW  float(53) NOT NULL,
-        Elevation1NE  float(53) NOT NULL,
-        Elevation2NE  float(53) NOT NULL,
-        Elevation1SE  float(53) NOT NULL,
-        Elevation2SE  float(53) NOT NULL,
-        Elevation1SW  float(53) NOT NULL,
-        Elevation2SW  float(53) NOT NULL,
-        WaterHeight  float(53) NOT NULL,
-        TerrainRaiseLimit  float(53) NOT NULL,
-        TerrainLowerLimit  float(53) NOT NULL,
-        UseEstateSun  bit NOT NULL,
-        FixedSun  bit NOT NULL,
-        SunPosition  float(53) NOT NULL,
-        Covenant  NVARCHAR(36) NULL DEFAULT (NULL),
-        Sandbox bit NOT NULL,
-        SunVectorX  float(53) NOT NULL DEFAULT ((0)),
-        SunVectorY  float(53) NOT NULL DEFAULT ((0)),
-        SunVectorZ  float(53) NOT NULL DEFAULT ((0)),
-        
-        primary key (RegionID)
-)
-
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql
deleted file mode 100644
index f5e0c00..0000000
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-ALTER TABLE UserAgents ADD PositionX REAL null;
-ALTER TABLE UserAgents ADD PositionY REAL null;
-ALTER TABLE UserAgents ADD PositionZ REAL null;
-ALTER TABLE UserAgents ADD LookAtX REAL null;
-ALTER TABLE UserAgents ADD LookAtY REAL null;
-ALTER TABLE UserAgents ADD LookAtZ REAL null;
-
-ALTER TABLE UserProfiles ADD Email NVARCHAR(250) null;
-ALTER TABLE UserProfiles ADD HomeRegionID NVARCHAR(36) null;
-ALTER TABLE UserProfiles ADD CanDoMask INT null;
-ALTER TABLE UserProfiles ADD WantDoMask INT null;
-ALTER TABLE UserProfiles ADD UserFlags INT null;
-ALTER TABLE UserProfiles ADD GodLevel INT null; 
-ALTER TABLE UserProfiles ADD CustomType NVARCHAR(32) null;
-ALTER TABLE UserProfiles ADD Partner NVARCHAR(36) null;
-
-ALTER TABLE UserAppearances ADD AvatarHeight FLOAT null;
-
-CREATE TABLE UserFriends (
-  UserFriendID NVARCHAR(36) NOT NULL,
-  OwnerID NVARCHAR(36) NULL,
-  FriendID NVARCHAR(36) NULL,
-  FriendPermissions INT NULL,
-  PRIMARY KEY (UserFriendID)  
-);
-
-CREATE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);  
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
deleted file mode 100644
index cd0958d..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_AssetStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE Assets (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  Local BIT DEFAULT NULL,
-  Temporary BIT DEFAULT NULL,
-  Data LONGBLOB,
-  PRIMARY KEY (ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
deleted file mode 100644
index e9ae07e..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
+++ /dev/null
@@ -1,71 +0,0 @@
-CREATE TABLE EstateSettings (
-  EstateID INT NOT NULL,
-  ParentEstateID INT DEFAULT NULL,
-  EstateOwnerID VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  RedirectGridX INT DEFAULT NULL,
-  RedirectGridY INT DEFAULT NULL,
-  BillableFactor DOUBLE DEFAULT NULL,
-  PricePerMeter INT DEFAULT NULL,
-  SunPosition DOUBLE DEFAULT NULL,
-  
-  UseGlobalTime BIT DEFAULT NULL,
-  FixedSun BIT DEFAULT NULL,
-  AllowVoice BIT DEFAULT NULL,
-  AllowDirectTeleport BIT DEFAULT NULL,
-  ResetHomeOnTeleport BIT DEFAULT NULL,
-  PublicAccess BIT DEFAULT NULL,
-  DenyAnonymous BIT DEFAULT NULL,
-  DenyIdentified BIT DEFAULT NULL,
-  DenyTransacted BIT DEFAULT NULL,
-  DenyMinors BIT DEFAULT NULL,
-  BlockDwell BIT DEFAULT NULL,
-  EstateSkipScripts BIT DEFAULT NULL,
-  TaxFree BIT DEFAULT NULL,
-  AbuseEmailToEstateOwner BIT DEFAULT NULL,
-  
-  AbuseEmail VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (EstateID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE EstateRegionLink (
-  EstateRegionLinkID VARCHAR(36) NOT NULL,
-  EstateID INT DEFAULT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (EstateRegionLinkID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
-
-CREATE TABLE EstateManagers (
-  EstateID INT NOT NULL,
-  ManagerID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE EstateUsers (
-  EstateID INT NOT NULL,
-  UserID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE EstateGroups (
-  EstateID INT NOT NULL,
-  GroupID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE EstateBans (
-  EstateID INT NOT NULL,
-  ArrayIndex INT NOT NULL,
-  BannedUserID VARCHAR(36) NOT NULL,
-  BannedHostAddress VARCHAR(16) NOT NULL,
-  BannedHostIPMask VARCHAR(16) NOT NULL,
-  BannedHostNameMask VARCHAR(16) NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql
deleted file mode 100644
index c6fe620..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE TABLE Regions (
-  RegionID VARCHAR(36) NOT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  OriginID VARCHAR(36) DEFAULT NULL,
-  RegionHandle BIGINT DEFAULT NULL,
-  RegionName VARCHAR(32) DEFAULT NULL,
-  RegionRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionSendKey VARCHAR(128) DEFAULT NULL,
-  RegionSecret VARCHAR(128) DEFAULT NULL,
-  RegionDataURI VARCHAR(255) DEFAULT NULL,
-  ServerIP VARCHAR(64) DEFAULT NULL,
-  ServerPort INT DEFAULT NULL,
-  ServerURI VARCHAR(255) DEFAULT NULL,
-  RegionLocX INT DEFAULT NULL,
-  RegionLocY INT DEFAULT NULL,
-  RegionLocZ INT DEFAULT NULL,
-  EastOverrideHandle BIGINT DEFAULT NULL,
-  WestOverrideHandle BIGINT DEFAULT NULL,
-  SouthOverrideHandle BIGINT DEFAULT NULL,
-  NorthOverrideHandle BIGINT DEFAULT NULL,
-  RegionAssetURI VARCHAR(255) DEFAULT NULL,
-  RegionAssetRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionAssetSendKey VARCHAR(128) DEFAULT NULL,
-  RegionUserURI VARCHAR(255) DEFAULT NULL,
-  RegionUserRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionUserSendKey VARCHAR(128) DEFAULT NULL, 
-  RegionMapTextureId VARCHAR(36) DEFAULT NULL,
-  ServerHttpPort INT DEFAULT NULL, 
-  ServerRemotingPort INT DEFAULT NULL,
-  PRIMARY KEY (RegionID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX RegionNameIndex ON Regions (RegionName);
-CREATE INDEX RegionHandleIndex ON Regions (RegionHandle);
-CREATE INDEX RegionHandlesIndex ON Regions (EastOverrideHandle,WestOverrideHandle,SouthOverrideHandle,NorthOverrideHandle);
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql
deleted file mode 100644
index 93d282b..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_InventoryStore.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-CREATE TABLE InventoryFolders (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Version INT DEFAULT NULL,
-  ParentID VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  PRIMARY KEY (ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX InventoryFoldersOwnerIdIndex ON InventoryFolders (Owner);
-CREATE INDEX InventoryFoldersParentIdIndex ON InventoryFolders (ParentID);
-
-CREATE TABLE InventoryItems (
-  ID VARCHAR(36) NOT NULL,
-  InvType INT DEFAULT NULL,
-  AssetType INT DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  Folder VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Creator VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryOnePermissions INT DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  GroupOwned BIT DEFAULT NULL,
-  SalePrice INT DEFAULT NULL,
-  SaleType TINYINT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  PRIMARY KEY (ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX InventoryItemsGroupIdIndex ON InventoryItems (GroupID);
-CREATE INDEX InventoryItemsOwnerIdIndex ON InventoryItems (Owner);
-CREATE INDEX InventoryItemsFolderIdIndex ON InventoryItems (Folder);
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
deleted file mode 100644
index eb1d8fe..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
+++ /dev/null
@@ -1,169 +0,0 @@
-CREATE TABLE Prims (
-  UUID VARCHAR(36) NOT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  ParentID INT DEFAULT NULL,
-  ParentUUID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  LinkNum INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Text VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  SitName VARCHAR(255) DEFAULT NULL,
-  TouchName VARCHAR(255) DEFAULT NULL,
-  ObjectFlags INT DEFAULT NULL,
-  OwnerMask INT DEFAULT NULL,
-  NextOwnerMask INT DEFAULT NULL,
-  GroupMask INT DEFAULT NULL,
-  EveryoneMask INT DEFAULT NULL,
-  BaseMask INT DEFAULT NULL,
-  Material TINYINT DEFAULT NULL,  
-  ScriptAccessPin INT DEFAULT NULL,
-  TextureAnimation BLOB,
-  ParticleSystem BLOB,
-  ClickAction TINYINT DEFAULT NULL,  
-  Color INT DEFAULT NULL,
-  PositionX DOUBLE DEFAULT NULL,
-  PositionY DOUBLE DEFAULT NULL,
-  PositionZ DOUBLE DEFAULT NULL,
-  GroupPositionX DOUBLE DEFAULT NULL,
-  GroupPositionY DOUBLE DEFAULT NULL,
-  GroupPositionZ DOUBLE DEFAULT NULL,
-  VelocityX DOUBLE DEFAULT NULL,
-  VelocityY DOUBLE DEFAULT NULL,
-  VelocityZ DOUBLE DEFAULT NULL,
-  AngularVelocityX DOUBLE DEFAULT NULL,
-  AngularVelocityY DOUBLE DEFAULT NULL,
-  AngularVelocityZ DOUBLE DEFAULT NULL,
-  AccelerationX DOUBLE DEFAULT NULL,
-  AccelerationY DOUBLE DEFAULT NULL,
-  AccelerationZ DOUBLE DEFAULT NULL,
-  RotationX DOUBLE DEFAULT NULL,
-  RotationY DOUBLE DEFAULT NULL,
-  RotationZ DOUBLE DEFAULT NULL,
-  RotationW DOUBLE DEFAULT NULL,
-  SitTargetOffsetX DOUBLE DEFAULT NULL,
-  SitTargetOffsetY DOUBLE DEFAULT NULL,
-  SitTargetOffsetZ DOUBLE DEFAULT NULL,
-  SitTargetOrientW DOUBLE DEFAULT NULL,
-  SitTargetOrientX DOUBLE DEFAULT NULL,
-  SitTargetOrientY DOUBLE DEFAULT NULL,
-  SitTargetOrientZ DOUBLE DEFAULT NULL,
-  -- this is the shape
-  Shape INT DEFAULT NULL,
-  ScaleX DOUBLE DEFAULT NULL,
-  ScaleY DOUBLE DEFAULT NULL,
-  ScaleZ DOUBLE DEFAULT NULL,
-  PCode INT DEFAULT NULL,
-  PathBegin INT DEFAULT NULL,
-  PathEnd INT DEFAULT NULL,
-  PathScaleX INT DEFAULT NULL,
-  PathScaleY INT DEFAULT NULL,
-  PathShearX INT DEFAULT NULL,
-  PathShearY INT DEFAULT NULL,
-  PathSkew INT DEFAULT NULL,
-  PathCurve INT DEFAULT NULL,
-  PathRadiusOffset INT DEFAULT NULL,
-  PathRevolutions INT DEFAULT NULL,
-  PathTaperX INT DEFAULT NULL,
-  PathTaperY INT DEFAULT NULL,
-  PathTwist INT DEFAULT NULL,
-  ProfileBegin INT DEFAULT NULL,
-  ProfileEnd INT DEFAULT NULL,
-  ProfileCurve INT DEFAULT NULL,
-  ProfileHollow INT DEFAULT NULL,
-  State INT DEFAULT NULL,
-  Texture LONGBLOB,
-  ExtraParams LONGBLOB,
-  PRIMARY KEY (UUID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX PrimsRegionIdIndex ON Prims (RegionID);
-CREATE INDEX PrimsRegionParentUuidIndex ON Prims (ParentUUID);
-
-CREATE TABLE Terrain (
-  RegionID VARCHAR(36) not null,
-  MapData LONGBLOB,
-  PRIMARY KEY (RegionID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE PrimItems (
-  ItemID VARCHAR(36) NOT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  PrimID VARCHAR(36) DEFAULT NULL,
-  ParentFolderID VARCHAR(36) DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate BIGINT DEFAULT NULL,
-  Type INT DEFAULT NULL,
-  InvType INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryonePermissions INT DEFAULT NULL,
-  GroupPermissions INT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  PRIMARY KEY (ItemID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX PrimItemsPrimIdIndex ON PrimItems (PrimID);
-
-CREATE TABLE RegionSettings (
-  RegionID VARCHAR(36) NOT NULL,
-  
-  BlockTerraform BIT DEFAULT NULL,
-  BlockFly BIT DEFAULT NULL,
-  AllowDamage BIT DEFAULT NULL,
-  RestrictPushing BIT DEFAULT NULL,
-  AllowLandResell BIT DEFAULT NULL,
-  AllowLandJoinDivide BIT DEFAULT NULL,
-  BlockShowInSearch BIT DEFAULT NULL,
-  
-  AgentLimit INT DEFAULT NULL,
-  ObjectBonus DOUBLE DEFAULT NULL,
-  Maturity INT DEFAULT NULL,
-  
-  DisableScripts BIT DEFAULT NULL,
-  DisableCollisions BIT DEFAULT NULL,
-  DisablePhysics BIT DEFAULT NULL,
-
-  TerrainTexture1 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture2 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture3 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture4 VARCHAR(36) DEFAULT NULL,
-
-  Elevation1NW DOUBLE DEFAULT NULL,
-  Elevation2NW DOUBLE DEFAULT NULL,
-  Elevation1NE DOUBLE DEFAULT NULL,
-  Elevation2NE DOUBLE DEFAULT NULL,
-  Elevation1SE DOUBLE DEFAULT NULL,
-  Elevation2SE DOUBLE DEFAULT NULL,
-  Elevation1SW DOUBLE DEFAULT NULL,
-  Elevation2SW DOUBLE DEFAULT NULL,
-  
-  WaterHeight DOUBLE DEFAULT NULL,
-  TerrainRaiseLimit DOUBLE DEFAULT NULL,
-  TerrainLowerLimit DOUBLE DEFAULT NULL,    
-
-  UseEstateSun BIT DEFAULT NULL,
-  Sandbox BIT DEFAULT NULL,
-
-  SunVectorX DOUBLE DEFAULT NULL,
-  SunVectorY DOUBLE DEFAULT NULL,
-  SunVectorZ DOUBLE DEFAULT NULL,
- 
-  FixedSun BIT DEFAULT NULL, 
-  SunPosition DOUBLE DEFAULT NULL, 
- 
-  Covenant VARCHAR(36) DEFAULT NULL,
-   
-  PRIMARY KEY  (RegionID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
deleted file mode 100644
index 140aea4..0000000
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql
+++ /dev/null
@@ -1,104 +0,0 @@
-CREATE TABLE UserAgents (
-  ProfileID VARCHAR(36) NOT NULL,
-  AgentIP VARCHAR(24) DEFAULT NULL,
-  AgentPort INT DEFAULT NULL,
-  AgentOnline BIT DEFAULT NULL,
-  SessionID VARCHAR(36) DEFAULT NULL,
-  SecureSessionID VARCHAR(36) DEFAULT NULL,
-  InitialRegion VARCHAR(255) DEFAULT NULL,
-  Region VARCHAR(255) DEFAULT NULL,
-  LoginTime INT DEFAULT NULL,
-  LogoutTime INT DEFAULT NULL,
-  Handle BIGINT DEFAULT NULL,
-  PositionX DOUBLE DEFAULT NULL,
-  PositionY DOUBLE DEFAULT NULL,
-  PositionZ DOUBLE DEFAULT NULL,
-  LookAtX DOUBLE DEFAULT NULL,
-  LookAtY DOUBLE DEFAULT NULL,
-  LookAtZ DOUBLE DEFAULT NULL,  
-  PRIMARY KEY (ProfileID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE UserProfiles (
-  ID VARCHAR(36) NOT NULL,
-  WebLoginKey VARCHAR(36) DEFAULT NULL,
-  FirstName VARCHAR(32) DEFAULT NULL,
-  SurName VARCHAR(32) DEFAULT NULL,
-  Email VARCHAR(250) DEFAULT NULL,
-  PasswordHash VARCHAR(32) DEFAULT NULL,
-  PasswordSalt VARCHAR(32) DEFAULT NULL,
-  HomeRegionID VARCHAR(36) DEFAULT NULL,
-  HomeRegionX INT DEFAULT NULL,
-  HomeRegionY INT DEFAULT NULL,
-  HomeLocationX DOUBLE DEFAULT NULL,
-  HomeLocationY DOUBLE DEFAULT NULL,
-  HomeLocationZ DOUBLE DEFAULT NULL,
-  HomeLookAtX DOUBLE DEFAULT NULL,
-  HomeLookAtY DOUBLE DEFAULT NULL,
-  HomeLookAtZ DOUBLE DEFAULT NULL,
-  Created INT DEFAULT NULL,
-  LastLogin INT DEFAULT NULL,
-  UserInventoryURI VARCHAR(255) DEFAULT NULL,
-  UserAssetURI VARCHAR(255) DEFAULT NULL,
-  Image VARCHAR(36) DEFAULT NULL,
-  FirstLifeImage VARCHAR(36) DEFAULT NULL,
-  AboutText TEXT DEFAULT NULL,
-  FirstLifeAboutText TEXT DEFAULT NULL,
-  CanDoMask INT DEFAULT NULL,
-  WantDoMask INT DEFAULT NULL,
-  UserFlags INT DEFAULT NULL,
-  GodLevel INT DEFAULT NULL,  
-  CustomType VARCHAR(32) DEFAULT NULL,
-  Partner VARCHAR(36) DEFAULT NULL,
-  RootInventoryFolderID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE INDEX UserSurnameIndex ON UserProfiles (SurName);
-CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName);
-CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName);
-
-CREATE TABLE UserAppearances (
-  Owner VARCHAR(36) NOT NULL,
-  BodyItem VARCHAR(36) DEFAULT NULL,
-  BodyAsset VARCHAR(36) DEFAULT NULL,
-  SkinItem VARCHAR(36) DEFAULT NULL,
-  SkinAsset VARCHAR(36) DEFAULT NULL,
-  HairItem VARCHAR(36) DEFAULT NULL,
-  HairAsset VARCHAR(36) DEFAULT NULL,
-  EyesItem VARCHAR(36) DEFAULT NULL,
-  EyesAsset VARCHAR(36) DEFAULT NULL,
-  ShirtItem VARCHAR(36) DEFAULT NULL,
-  ShirtAsset VARCHAR(36) DEFAULT NULL,
-  PantsItem VARCHAR(36) DEFAULT NULL,
-  PantsAsset VARCHAR(36) DEFAULT NULL,
-  ShoesItem VARCHAR(36) DEFAULT NULL,
-  ShoesAsset VARCHAR(36) DEFAULT NULL,
-  SocksItem VARCHAR(36) DEFAULT NULL,
-  SocksAsset VARCHAR(36) DEFAULT NULL,
-  JacketItem VARCHAR(36) DEFAULT NULL,
-  JacketAsset VARCHAR(36) DEFAULT NULL,
-  GlovesItem VARCHAR(36) DEFAULT NULL,
-  GlovesAsset VARCHAR(36) DEFAULT NULL,
-  UnderShirtItem VARCHAR(36) DEFAULT NULL,
-  UnderShirtAsset VARCHAR(36) DEFAULT NULL,
-  UnderPantsItem VARCHAR(36) DEFAULT NULL,
-  UnderPantsAsset VARCHAR(36) DEFAULT NULL,
-  SkirtItem VARCHAR(36) DEFAULT NULL,
-  SkirtAsset VARCHAR(36) DEFAULT NULL,
-  Texture LONGBLOB,
-  VisualParams LONGBLOB,
-  Serial INT DEFAULT NULL,
-  AvatarHeight FLOAT DEFAULT NULL,    
-  PRIMARY KEY (Owner)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE TABLE UserFriends (
-  UserFriendID VARCHAR(36) NOT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  FriendID VARCHAR(36) DEFAULT NULL,
-  FriendPermissions INT DEFAULT NULL,
-  PRIMARY KEY (UserFriendID)  
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);  
diff --git a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
deleted file mode 100644
index 37b23cb..0000000
--- a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Addin id="OpenSim.Data.NHibernate" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Data.NHibernate.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim.Data" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/GridData">
-        <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" />
-    </Extension>
-  <!-- <Extension path = "/OpenSim/LogData">
-        <Plugin id="MySQLLogData" provider="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
-    </Extension> -->
-    <Extension path = "/OpenSim/AssetData">
-        <Plugin id="NHibernateAssetData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateAssetData" />
-    </Extension>
-    <Extension path = "/OpenSim/InventoryData">
-        <Plugin id="NHibernateInventoryData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateInventoryData" />
-    </Extension>
-    <Extension path = "/OpenSim/UserData">
-        <Plugin id="NHibernateUserData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateUserData" />
-    </Extension>
-</Addin>
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
deleted file mode 100644
index 4753123..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_AssetStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE Assets (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  Local BOOLEAN DEFAULT NULL,
-  Temporary BOOLEAN DEFAULT NULL,
-  Data BYTEA,
-  PRIMARY KEY (ID)
-);
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
deleted file mode 100644
index 3f47930..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
+++ /dev/null
@@ -1,72 +0,0 @@
-CREATE TABLE EstateSettings (
-  EstateID INT NOT NULL,
-  ParentEstateID INT DEFAULT NULL,
-  EstateOwnerID VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  RedirectGridX INT DEFAULT NULL,
-  RedirectGridY INT DEFAULT NULL,
-  BillableFactor DOUBLE PRECISION DEFAULT NULL,
-  PricePerMeter INT DEFAULT NULL,
-  SunPosition DOUBLE PRECISION DEFAULT NULL,
-  
-  UseGlobalTime BOOLEAN DEFAULT NULL,
-  FixedSun BOOLEAN DEFAULT NULL,
-  AllowVoice BOOLEAN DEFAULT NULL,
-  AllowDirectTeleport BOOLEAN DEFAULT NULL,
-  ResetHomeOnTeleport BOOLEAN DEFAULT NULL,
-  PublicAccess BOOLEAN DEFAULT NULL,
-  DenyAnonymous BOOLEAN DEFAULT NULL,
-  DenyIdentified BOOLEAN DEFAULT NULL,
-  DenyTransacted BOOLEAN DEFAULT NULL,
-  DenyMinors BOOLEAN DEFAULT NULL,
-  BlockDwell BOOLEAN DEFAULT NULL,
-  EstateSkipScripts BOOLEAN DEFAULT NULL,
-  TaxFree BOOLEAN DEFAULT NULL,
-  AbuseEmailToEstateOwner BOOLEAN DEFAULT NULL,
-  
-  AbuseEmail VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (EstateID)
-);
-
-CREATE TABLE EstateRegionLink (
-  EstateRegionLinkID VARCHAR(36) NOT NULL,
-  EstateID INT DEFAULT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (EstateRegionLinkID)
-);
-
-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
-
-
-CREATE TABLE EstateManagers (
-  EstateID INT NOT NULL,
-  ManagerID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateUsers (
-  EstateID INT NOT NULL,
-  UserID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateGroups (
-  EstateID INT NOT NULL,
-  GroupID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateBans (
-  EstateID INT NOT NULL,
-  ArrayIndex INT NOT NULL,
-  BannedUserID VARCHAR(36) NOT NULL,
-  BannedHostAddress VARCHAR(16) NOT NULL,
-  BannedHostIPMask VARCHAR(16) NOT NULL,
-  BannedHostNameMask VARCHAR(16) NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_GridStore.sql
deleted file mode 100644
index 4366c1e..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_GridStore.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE TABLE Regions (
-  RegionID VARCHAR(36) NOT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  OriginID VARCHAR(36) DEFAULT NULL,
-  RegionHandle BIGINT DEFAULT NULL,
-  RegionName VARCHAR(32) DEFAULT NULL,
-  RegionRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionSendKey VARCHAR(128) DEFAULT NULL,
-  RegionSecret VARCHAR(128) DEFAULT NULL,
-  RegionDataURI VARCHAR(255) DEFAULT NULL,
-  ServerIP VARCHAR(64) DEFAULT NULL,
-  ServerPort INT DEFAULT NULL,
-  ServerURI VARCHAR(255) DEFAULT NULL,
-  RegionLocX INT DEFAULT NULL,
-  RegionLocY INT DEFAULT NULL,
-  RegionLocZ INT DEFAULT NULL,
-  EastOverrideHandle BIGINT DEFAULT NULL,
-  WestOverrideHandle BIGINT DEFAULT NULL,
-  SouthOverrideHandle BIGINT DEFAULT NULL,
-  NorthOverrideHandle BIGINT DEFAULT NULL,
-  RegionAssetURI VARCHAR(255) DEFAULT NULL,
-  RegionAssetRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionAssetSendKey VARCHAR(128) DEFAULT NULL,
-  RegionUserURI VARCHAR(255) DEFAULT NULL,
-  RegionUserRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionUserSendKey VARCHAR(128) DEFAULT NULL, 
-  RegionMapTextureId VARCHAR(36) DEFAULT NULL,
-  ServerHttpPort INT DEFAULT NULL, 
-  ServerRemotingPort INT DEFAULT NULL,
-  PRIMARY KEY (RegionID)
-);
-
-CREATE INDEX RegionNameIndex ON Regions (RegionName);
-CREATE INDEX RegionHandleIndex ON Regions (RegionHandle);
-CREATE INDEX RegionHandlesIndex ON Regions (EastOverrideHandle,WestOverrideHandle,SouthOverrideHandle,NorthOverrideHandle);
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql
deleted file mode 100644
index 42af659..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_InventoryStore.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-CREATE TABLE InventoryFolders (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Version INT DEFAULT NULL,
-  ParentID VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX InventoryFoldersOwnerIdIndex ON InventoryFolders (Owner);
-CREATE INDEX InventoryFoldersParentIdIndex ON InventoryFolders (ParentID);
-
-CREATE TABLE InventoryItems (
-  ID VARCHAR(36) NOT NULL,
-  InvType INT DEFAULT NULL,
-  AssetType INT DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  Folder VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Creator VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryOnePermissions INT DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  GroupOwned BOOLEAN DEFAULT NULL,
-  SalePrice INT DEFAULT NULL,
-  SaleType SMALLINT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX InventoryItemsGroupIdIndex ON InventoryItems (GroupID);
-CREATE INDEX InventoryItemsOwnerIdIndex ON InventoryItems (Owner);
-CREATE INDEX InventoryItemsFolderIdIndex ON InventoryItems (Folder);
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
deleted file mode 100644
index f4a0e68..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
+++ /dev/null
@@ -1,169 +0,0 @@
-CREATE TABLE Prims (
-  UUID VARCHAR(36) NOT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  ParentID INT DEFAULT NULL,
-  ParentUUID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  LinkNum INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Text VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  SitName VARCHAR(255) DEFAULT NULL,
-  TouchName VARCHAR(255) DEFAULT NULL,
-  ObjectFlags INT DEFAULT NULL,
-  OwnerMask INT DEFAULT NULL,
-  NextOwnerMask INT DEFAULT NULL,
-  GroupMask INT DEFAULT NULL,
-  EveryoneMask INT DEFAULT NULL,
-  BaseMask INT DEFAULT NULL,
-  Material SMALLINT DEFAULT NULL,  
-  ScriptAccessPin INT DEFAULT NULL,
-  TextureAnimation BYTEA,
-  ParticleSystem BYTEA,
-  ClickAction SMALLINT DEFAULT NULL,  
-  Color INT DEFAULT NULL,
-  PositionX DOUBLE PRECISION DEFAULT NULL,
-  PositionY DOUBLE PRECISION DEFAULT NULL,
-  PositionZ DOUBLE PRECISION DEFAULT NULL,
-  GroupPositionX DOUBLE PRECISION DEFAULT NULL,
-  GroupPositionY DOUBLE PRECISION DEFAULT NULL,
-  GroupPositionZ DOUBLE PRECISION DEFAULT NULL,
-  VelocityX DOUBLE PRECISION DEFAULT NULL,
-  VelocityY DOUBLE PRECISION DEFAULT NULL,
-  VelocityZ DOUBLE PRECISION DEFAULT NULL,
-  AngularVelocityX DOUBLE PRECISION DEFAULT NULL,
-  AngularVelocityY DOUBLE PRECISION DEFAULT NULL,
-  AngularVelocityZ DOUBLE PRECISION DEFAULT NULL,
-  AccelerationX DOUBLE PRECISION DEFAULT NULL,
-  AccelerationY DOUBLE PRECISION DEFAULT NULL,
-  AccelerationZ DOUBLE PRECISION DEFAULT NULL,
-  RotationX DOUBLE PRECISION DEFAULT NULL,
-  RotationY DOUBLE PRECISION DEFAULT NULL,
-  RotationZ DOUBLE PRECISION DEFAULT NULL,
-  RotationW DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOffsetX DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOffsetY DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOffsetZ DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOrientW DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOrientX DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOrientY DOUBLE PRECISION DEFAULT NULL,
-  SitTargetOrientZ DOUBLE PRECISION DEFAULT NULL,
-  -- this is the shape
-  Shape INT DEFAULT NULL,
-  ScaleX DOUBLE PRECISION DEFAULT NULL,
-  ScaleY DOUBLE PRECISION DEFAULT NULL,
-  ScaleZ DOUBLE PRECISION DEFAULT NULL,
-  PCode INT DEFAULT NULL,
-  PathBegin INT DEFAULT NULL,
-  PathEnd INT DEFAULT NULL,
-  PathScaleX INT DEFAULT NULL,
-  PathScaleY INT DEFAULT NULL,
-  PathShearX INT DEFAULT NULL,
-  PathShearY INT DEFAULT NULL,
-  PathSkew SMALLINT DEFAULT NULL,
-  PathCurve INT DEFAULT NULL,
-  PathRadiusOffset SMALLINT DEFAULT NULL,
-  PathRevolutions INT DEFAULT NULL,
-  PathTaperX SMALLINT DEFAULT NULL,
-  PathTaperY SMALLINT DEFAULT NULL,
-  PathTwist SMALLINT DEFAULT NULL,
-  ProfileBegin INT DEFAULT NULL,
-  ProfileEnd INT DEFAULT NULL,
-  ProfileCurve INT DEFAULT NULL,
-  ProfileHollow INT DEFAULT NULL,
-  State INT DEFAULT NULL,
-  Texture BYTEA,
-  ExtraParams BYTEA,
-  PRIMARY KEY (UUID)
-);
-
-CREATE INDEX PrimsRegionIdIndex ON Prims (RegionID);
-CREATE INDEX PrimsRegionParentUuidIndex ON Prims (ParentUUID);
-
-CREATE TABLE Terrain (
-  RegionID VARCHAR(36) not null,
-  MapData BYTEA,
-  PRIMARY KEY (RegionID)
-);
-
-CREATE TABLE PrimItems (
-  ItemID VARCHAR(36) NOT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  PrimID VARCHAR(36) DEFAULT NULL,
-  ParentFolderID VARCHAR(36) DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  Type INT DEFAULT NULL,  
-  InvType INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryonePermissions INT DEFAULT NULL,
-  GroupPermissions INT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  PRIMARY KEY (ItemID)
-);
-
-CREATE INDEX PrimItemsPrimIdIndex ON PrimItems (PrimID);
-
-CREATE TABLE RegionSettings (
-  RegionID VARCHAR(36) NOT NULL,
-  
-  BlockTerraform BOOLEAN DEFAULT NULL,
-  BlockFly BOOLEAN DEFAULT NULL,
-  AllowDamage BOOLEAN DEFAULT NULL,
-  RestrictPushing BOOLEAN DEFAULT NULL,
-  AllowLandResell BOOLEAN DEFAULT NULL,
-  AllowLandJoinDivide BOOLEAN DEFAULT NULL,
-  BlockShowInSearch BOOLEAN DEFAULT NULL,
-  
-  AgentLimit INT DEFAULT NULL,
-  ObjectBonus DOUBLE PRECISION DEFAULT NULL,
-  Maturity INT DEFAULT NULL,
-  
-  DisableScripts BOOLEAN DEFAULT NULL,
-  DisableCollisions BOOLEAN DEFAULT NULL,
-  DisablePhysics BOOLEAN DEFAULT NULL,
-
-  TerrainTexture1 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture2 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture3 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture4 VARCHAR(36) DEFAULT NULL,
-
-  Elevation1NW DOUBLE PRECISION DEFAULT NULL,
-  Elevation2NW DOUBLE PRECISION DEFAULT NULL,
-  Elevation1NE DOUBLE PRECISION DEFAULT NULL,
-  Elevation2NE DOUBLE PRECISION DEFAULT NULL,
-  Elevation1SE DOUBLE PRECISION DEFAULT NULL,
-  Elevation2SE DOUBLE PRECISION DEFAULT NULL,
-  Elevation1SW DOUBLE PRECISION DEFAULT NULL,
-  Elevation2SW DOUBLE PRECISION DEFAULT NULL,
-  
-  WaterHeight DOUBLE PRECISION DEFAULT NULL,
-  TerrainRaiseLimit DOUBLE PRECISION DEFAULT NULL,
-  TerrainLowerLimit DOUBLE PRECISION DEFAULT NULL,    
-
-  UseEstateSun BOOLEAN DEFAULT NULL,
-  Sandbox BOOLEAN DEFAULT NULL,
-
-  SunVectorX DOUBLE PRECISION DEFAULT NULL,
-  SunVectorY DOUBLE PRECISION DEFAULT NULL,
-  SunVectorZ DOUBLE PRECISION DEFAULT NULL,
- 
-  FixedSun BOOLEAN DEFAULT NULL, 
-  SunPosition DOUBLE PRECISION DEFAULT NULL, 
- 
-  Covenant VARCHAR(36) DEFAULT NULL,
-   
-  PRIMARY KEY  (RegionID)
-);
-
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_UserStore.sql
deleted file mode 100644
index b3c7ef1..0000000
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_UserStore.sql
+++ /dev/null
@@ -1,104 +0,0 @@
-CREATE TABLE UserAgents (
-  ProfileID VARCHAR(36) NOT NULL,
-  AgentIP VARCHAR(24) DEFAULT NULL,
-  AgentPort INT DEFAULT NULL,
-  AgentOnline BOOLEAN DEFAULT NULL,
-  SessionID VARCHAR(36) DEFAULT NULL,
-  SecureSessionID VARCHAR(36) DEFAULT NULL,
-  InitialRegion VARCHAR(255) DEFAULT NULL,
-  Region VARCHAR(255) DEFAULT NULL,
-  LoginTime INT DEFAULT NULL,
-  LogoutTime INT DEFAULT NULL,
-  Handle BIGINT DEFAULT NULL,
-  PositionX DOUBLE PRECISION DEFAULT NULL,
-  PositionY DOUBLE PRECISION DEFAULT NULL,
-  PositionZ DOUBLE PRECISION DEFAULT NULL,
-  LookAtX DOUBLE PRECISION DEFAULT NULL,
-  LookAtY DOUBLE PRECISION DEFAULT NULL,
-  LookAtZ DOUBLE PRECISION DEFAULT NULL,  
-  PRIMARY KEY (ProfileID)
-);
-
-CREATE TABLE UserProfiles (
-  ID VARCHAR(36) NOT NULL,
-  WebLoginKey VARCHAR(36) DEFAULT NULL,
-  FirstName VARCHAR(32) DEFAULT NULL,
-  SurName VARCHAR(32) DEFAULT NULL,
-  Email VARCHAR(250) DEFAULT NULL,
-  PasswordHash VARCHAR(32) DEFAULT NULL,
-  PasswordSalt VARCHAR(32) DEFAULT NULL,
-  HomeRegionID VARCHAR(36) DEFAULT NULL,
-  HomeRegionX INT DEFAULT NULL,
-  HomeRegionY INT DEFAULT NULL,
-  HomeLocationX DOUBLE PRECISION DEFAULT NULL,
-  HomeLocationY DOUBLE PRECISION DEFAULT NULL,
-  HomeLocationZ DOUBLE PRECISION DEFAULT NULL,
-  HomeLookAtX DOUBLE PRECISION DEFAULT NULL,
-  HomeLookAtY DOUBLE PRECISION DEFAULT NULL,
-  HomeLookAtZ DOUBLE PRECISION DEFAULT NULL,
-  Created INT DEFAULT NULL,
-  LastLogin INT DEFAULT NULL,
-  UserInventoryURI VARCHAR(255) DEFAULT NULL,
-  UserAssetURI VARCHAR(255) DEFAULT NULL,
-  Image VARCHAR(36) DEFAULT NULL,
-  FirstLifeImage VARCHAR(36) DEFAULT NULL,
-  AboutText TEXT DEFAULT NULL,
-  FirstLifeAboutText TEXT DEFAULT NULL,
-  CanDoMask INT DEFAULT NULL,
-  WantDoMask INT DEFAULT NULL,
-  UserFlags INT DEFAULT NULL,
-  GodLevel INT DEFAULT NULL,  
-  CustomType VARCHAR(32) DEFAULT NULL,
-  Partner VARCHAR(36) DEFAULT NULL,
-  RootInventoryFolderID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX UserSurnameIndex ON UserProfiles (SurName);
-CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName);
-CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName);
-
-CREATE TABLE UserAppearances (
-  Owner VARCHAR(36) NOT NULL,
-  BodyItem VARCHAR(36) DEFAULT NULL,
-  BodyAsset VARCHAR(36) DEFAULT NULL,
-  SkinItem VARCHAR(36) DEFAULT NULL,
-  SkinAsset VARCHAR(36) DEFAULT NULL,
-  HairItem VARCHAR(36) DEFAULT NULL,
-  HairAsset VARCHAR(36) DEFAULT NULL,
-  EyesItem VARCHAR(36) DEFAULT NULL,
-  EyesAsset VARCHAR(36) DEFAULT NULL,
-  ShirtItem VARCHAR(36) DEFAULT NULL,
-  ShirtAsset VARCHAR(36) DEFAULT NULL,
-  PantsItem VARCHAR(36) DEFAULT NULL,
-  PantsAsset VARCHAR(36) DEFAULT NULL,
-  ShoesItem VARCHAR(36) DEFAULT NULL,
-  ShoesAsset VARCHAR(36) DEFAULT NULL,
-  SocksItem VARCHAR(36) DEFAULT NULL,
-  SocksAsset VARCHAR(36) DEFAULT NULL,
-  JacketItem VARCHAR(36) DEFAULT NULL,
-  JacketAsset VARCHAR(36) DEFAULT NULL,
-  GlovesItem VARCHAR(36) DEFAULT NULL,
-  GlovesAsset VARCHAR(36) DEFAULT NULL,
-  UnderShirtItem VARCHAR(36) DEFAULT NULL,
-  UnderShirtAsset VARCHAR(36) DEFAULT NULL,
-  UnderPantsItem VARCHAR(36) DEFAULT NULL,
-  UnderPantsAsset VARCHAR(36) DEFAULT NULL,
-  SkirtItem VARCHAR(36) DEFAULT NULL,
-  SkirtAsset VARCHAR(36) DEFAULT NULL,
-  Texture BYTEA,
-  VisualParams BYTEA,
-  Serial INT DEFAULT NULL,
-  AvatarHeight FLOAT DEFAULT NULL,    
-  PRIMARY KEY (Owner)
-);
-
-CREATE TABLE UserFriends (
-  UserFriendID VARCHAR(36) NOT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  FriendID VARCHAR(36) DEFAULT NULL,
-  FriendPermissions INT DEFAULT NULL,
-  PRIMARY KEY (UserFriendID)  
-);
-
-CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);  
diff --git a/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml
deleted file mode 100644
index 5ff37d8..0000000
--- a/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false">
-        <id name="Uuid" column="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-
-        <property name="Owner_uuid" column="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="OriginUUID" column="OriginID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-
-        <property name="RegionHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-        <property name="RegionName" type="String" length="32" />
-        <property name="RegionRecvKey" type="String" length="128" />
-        <property name="RegionSendKey" type="String" length="128" />
-        <property name="RegionSecret" type="String" length="128" />
-        <property name="RegionDataURI" type="String" length="255" />
-      
-        <property name="ServerIP" type="String" length="64" />
-        <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="ServerURI" type="String" length="255" />
-
-        <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-
-        <property name="EastOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-        <property name="WestOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-        <property name="SouthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-        <property name="NorthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-
-        <property name="RegionAssetURI" type="String" length="255" />
-        <property name="RegionAssetRecvKey" type="String" length="128" />
-        <property name="RegionAssetSendKey" type="String" length="128" />
-
-        <property name="RegionUserURI" type="String" length="255" />
-        <property name="RegionUserRecvKey" type="String" length="128" />
-        <property name="RegionUserSendKey" type="String" length="128" />
-        <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-
-        <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionSettings.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionSettings.hbm.xml
deleted file mode 100644
index 3843a8d..0000000
--- a/OpenSim/Data/NHibernate/Resources/RegionSettings.hbm.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.RegionSettings, OpenSim.Framework" table="RegionSettings" lazy="false">
-        <id name="RegionUUID" column="RegionId" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-
-        <property name="BlockTerraform" type="System.Boolean" />
-        <property name="BlockFly" type="System.Boolean" />
-        <property name="AllowDamage" type="System.Boolean" />
-        <property name="RestrictPushing" type="System.Boolean" />
-        <property name="AllowLandResell" type="System.Boolean" />
-        <property name="AllowLandJoinDivide" type="System.Boolean" />
-        <property name="BlockShowInSearch" type="System.Boolean" />
-
-        <property name="AgentLimit" type="System.Int32" />
-        <property name="ObjectBonus" type="System.Double" />
-        <property name="Maturity" type="System.Int32" />
-
-        <property name="DisableScripts" type="System.Boolean" />
-        <property name="DisableCollisions" type="System.Boolean" />
-        <property name="DisablePhysics" type="System.Boolean" />
-
-        <property name="TerrainTexture1" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="TerrainTexture2" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="TerrainTexture3" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="TerrainTexture4" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-
-        <property name="Elevation1NW" type="System.Double" />
-        <property name="Elevation2NW" type="System.Double" />
-        <property name="Elevation1NE" type="System.Double" />
-        <property name="Elevation2NE" type="System.Double" />
-        <property name="Elevation1SE" type="System.Double" />
-        <property name="Elevation2SE" type="System.Double" />
-        <property name="Elevation1SW" type="System.Double" />
-        <property name="Elevation2SW" type="System.Double" />
-
-        <property name="WaterHeight" type="System.Double" />
-        <property name="TerrainRaiseLimit" type="System.Double" />
-        <property name="TerrainLowerLimit" type="System.Double" />
-      
-        <property name="UseEstateSun" type="System.Boolean" />
-        <property name="Sandbox" type="System.Boolean" />
-
-        <property name="SunVector" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="SunVectorX" />
-          <column name="SunVectorY" />
-          <column name="SunVectorZ" />
-        </property>
-
-      <property name="FixedSun" type="System.Boolean" />
-        <property name="SunPosition" type="System.Double" />
-        <property name="Covenant" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
deleted file mode 100644
index 98c648b..0000000
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Region.Framework.Scenes.SceneObjectPart, OpenSim.Region.Framework" table="Prims" lazy="false">
-        <id name="UUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-        <property name="ParentID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"/>
-        <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="CreationDate" type="System.Int32" />
-        <property name="Name" type="String" length="255" />
-        <property name="Text" type="String" length="255" />
-        <property name="Description" type="String" length="255" />
-        <property name="SitName" type="String" length="255" />
-        <property name="TouchName" type="String" length="255" />
-        <property name="Color" type="OpenSim.Data.NHibernate.ColorUserType, OpenSim.Data.NHibernate" />
-
-        <property name="ObjectFlags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="LinkNum" type="System.Int32" />
-
-        <property name="OwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="NextOwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="GroupMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="EveryoneMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="BaseMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-
-        <property name="Material" type="Byte" />
-        <property name="ScriptAccessPin" type="System.Int32" />
-        <property name="TextureAnimation" type="binary" />
-        <property name="ParticleSystem" type="binary" />
-        <property name="ClickAction" type="Byte" />
-
-        <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="PositionX" />
-          <column name="PositionY" />
-          <column name="PositionZ" />
-        </property>
-
-        <property name="GroupPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="GroupPositionX" />
-          <column name="GroupPositionY" />
-          <column name="GroupPositionZ" />
-        </property>
-
-        <property name="Velocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="VelocityX" />
-          <column name="VelocityY" />
-          <column name="VelocityZ" />
-        </property>
-
-        <property name="AngularVelocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="AngularVelocityX" />
-          <column name="AngularVelocityY" />
-          <column name="AngularVelocityZ" />
-        </property>
-
-        <property name="Acceleration" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="AccelerationX" />
-          <column name="AccelerationY" />
-          <column name="AccelerationZ" />
-        </property>
-
-        <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="SitTargetOffsetX" />
-          <column name="SitTargetOffsetY" />
-          <column name="SitTargetOffsetZ" />
-        </property>
-
-        <property name="RotationOffset" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
-          <column name="RotationX" />
-          <column name="RotationY" />
-          <column name="RotationZ" />
-          <column name="RotationW" />
-        </property>
-        
-        <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
-          <column name="SitTargetOrientX" />
-          <column name="SitTargetOrientY" />
-          <column name="SitTargetOrientZ" />
-          <column name="SitTargetOrientW" />
-        </property>
-        
-        <component name="Shape">
-          <property name="Scale" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-            <column name="ScaleX" />
-            <column name="ScaleY" />
-            <column name="ScaleZ" />
-          </property>
-          <property name="PCode" type="System.Byte" />
-          <property name="PathBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />
-          <property name="PathEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />
-          <property name="PathScaleX" type="System.Byte" />
-          <property name="PathScaleY" type="System.Byte" />
-          <property name="PathShearX" type="System.Byte" />
-          <property name="PathShearY" type="System.Byte" />
-          <property name="PathSkew" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-          <property name="PathCurve" type="System.Byte" />
-          <property name="PathRadiusOffset" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-          <property name="PathRevolutions" type="System.Byte" />
-          <property name="PathTaperX" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-          <property name="PathTaperY" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-          <property name="PathTwist" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-          <property name="ProfileBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />
-          <property name="ProfileEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />
-          <property name="ProfileCurve" type="System.Byte" />
-          <property name="ProfileHollow" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" />    
-          <property name="TextureEntry" column="Texture" type="binary" />
-          <property name="ExtraParams" type="binary" />
-          <property name="State" type="System.Byte" />
-        </component>
-    </class>
-    <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false">
-        <id name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-          <generator class="assigned" /> 
-        </id>
-        <!-- <property name="MapData" type="OpenSim.Data.NHibernate.BlobType, OpenSim.Data.NHibernate" /> -->
-        <property name="MapData" type="binary" />
-    </class>
-    <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false">
-      <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-        <generator class="assigned" /> 
-      </id>
-      <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="CurrentPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="BasePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="EveryonePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="GroupPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="NextPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="Name" type="String" length="255" />
-      <property name="Description" type="String" length="255" />
-      <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="InvType" type="System.Int32" />
-      <property name="Type" type="System.Int32" />
-    </class>
- 
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
deleted file mode 100644
index aedf764..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_AssetStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE Assets (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  Local BIT DEFAULT NULL,
-  Temporary BIT DEFAULT NULL,
-  Data BLOB,
-  PRIMARY KEY (ID)
-);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
deleted file mode 100644
index afe702f..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
+++ /dev/null
@@ -1,71 +0,0 @@
-CREATE TABLE EstateSettings (
-  EstateID INT NOT NULL,
-  ParentEstateID INT DEFAULT NULL,
-  EstateOwnerID VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  RedirectGridX INT DEFAULT NULL,
-  RedirectGridY INT DEFAULT NULL,
-  BillableFactor DOUBLE DEFAULT NULL,
-  PricePerMeter INT DEFAULT NULL,
-  SunPosition DOUBLE DEFAULT NULL,
-  
-  UseGlobalTime BIT DEFAULT NULL,
-  FixedSun BIT DEFAULT NULL,
-  AllowVoice BIT DEFAULT NULL,
-  AllowDirectTeleport BIT DEFAULT NULL,
-  ResetHomeOnTeleport BIT DEFAULT NULL,
-  PublicAccess BIT DEFAULT NULL,
-  DenyAnonymous BIT DEFAULT NULL,
-  DenyIdentified BIT DEFAULT NULL,
-  DenyTransacted BIT DEFAULT NULL,
-  DenyMinors BIT DEFAULT NULL,
-  BlockDwell BIT DEFAULT NULL,
-  EstateSkipScripts BIT DEFAULT NULL,
-  TaxFree BIT DEFAULT NULL,
-  AbuseEmailToEstateOwner BIT DEFAULT NULL,
-  
-  AbuseEmail VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (EstateID)
-);
-
-CREATE TABLE EstateRegionLink (
-  EstateRegionLinkID VARCHAR(36) NOT NULL,
-  EstateID INT DEFAULT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (EstateRegionLinkID)
-);
-
-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
-
-CREATE TABLE EstateManagers (
-  EstateID INT NOT NULL,
-  ManagerID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateUsers (
-  EstateID INT NOT NULL,
-  UserID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateGroups (
-  EstateID INT NOT NULL,
-  GroupID VARCHAR(36) NOT NULL,
-  ArrayIndex INT NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
-
-CREATE TABLE EstateBans (
-  EstateID INT NOT NULL,
-  ArrayIndex INT NOT NULL,
-  BannedUserID VARCHAR(36) NOT NULL,
-  BannedHostAddress VARCHAR(16) NOT NULL,
-  BannedHostIPMask VARCHAR(16) NOT NULL,
-  BannedHostNameMask VARCHAR(16) NOT NULL,
-  PRIMARY KEY (EstateID,ArrayIndex)
-);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql
deleted file mode 100644
index 4f09848..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE TABLE Regions (
-  RegionId VARCHAR(36) NOT NULL,
-  RegionHandle BIGINT UNSIGNED NOT NULL,
-  RegionName VARCHAR(32) DEFAULT NULL,
-  RegionRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionSendKey VARCHAR(128) DEFAULT NULL,
-  RegionSecret VARCHAR(128) DEFAULT NULL,
-  RegionDataURI VARCHAR(255) DEFAULT NULL,
-  ServerIP VARCHAR(64) DEFAULT NULL,
-  ServerPort INT UNSIGNED DEFAULT NULL,
-  ServerURI VARCHAR(255) DEFAULT NULL,
-  RegionLocX INT UNSIGNED DEFAULT NULL,
-  RegionLocY INT UNSIGNED DEFAULT NULL,
-  RegionLocZ INT UNSIGNED DEFAULT NULL,
-  EastOverrideHandle BIGINT UNSIGNED DEFAULT NULL,
-  WestOverrideHandle BIGINT UNSIGNED DEFAULT NULL,
-  SouthOverrideHandle BIGINT UNSIGNED DEFAULT NULL,
-  NorthOverrideHandle BIGINT UNSIGNED DEFAULT NULL,
-  RegionAssetURI VARCHAR(255) DEFAULT NULL,
-  RegionAssetRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionAssetSendKey VARCHAR(128) DEFAULT NULL,
-  RegionUserURI VARCHAR(255) DEFAULT NULL,
-  RegionUserRecvKey VARCHAR(128) DEFAULT NULL,
-  RegionUserSendKey VARCHAR(128) DEFAULT NULL, 
-  RegionMapTextureId VARCHAR(36) DEFAULT NULL,
-  ServerHttpPort INT DEFAULT NULL, 
-  ServerRemotingPort INT DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  OriginID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (RegionId)
-);
-
-CREATE INDEX RegionNameIndex ON Regions (RegionName);
-CREATE INDEX RegionHandleIndex ON Regions (RegionHandle);
-CREATE INDEX RegionHandlesIndex ON Regions (EastOverrideHandle,WestOverrideHandle,SouthOverrideHandle,NorthOverrideHandle);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql
deleted file mode 100644
index 38978ee..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_InventoryStore.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-CREATE TABLE InventoryFolders (
-  ID VARCHAR(36) NOT NULL,
-  Type SMALLINT DEFAULT NULL,
-  Version INT DEFAULT NULL,
-  ParentID VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX InventoryFoldersOwnerIdIndex ON InventoryFolders (Owner);
-CREATE INDEX InventoryFoldersParentIdIndex ON InventoryFolders (ParentID);
-
-CREATE TABLE InventoryItems (
-  ID VARCHAR(36) NOT NULL,
-  InvType INT DEFAULT NULL,
-  AssetType INT DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  Folder VARCHAR(36) DEFAULT NULL,
-  Owner VARCHAR(36) DEFAULT NULL,
-  Creator VARCHAR(36) DEFAULT NULL,
-  Name VARCHAR(64) DEFAULT NULL,
-  Description VARCHAR(64) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryOnePermissions INT DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  GroupOwned BIT DEFAULT NULL,
-  SalePrice INT DEFAULT NULL,
-  SaleType TINYINT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX InventoryItemsGroupIdIndex ON InventoryItems (GroupID);
-CREATE INDEX InventoryItemsOwnerIdIndex ON InventoryItems (Owner);
-CREATE INDEX InventoryItemsFolderIdIndex ON InventoryItems (Folder);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql
deleted file mode 100644
index 2b8e62a..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql
+++ /dev/null
@@ -1,168 +0,0 @@
-CREATE TABLE Prims (
-  UUID VARCHAR(36) NOT NULL,
-  RegionID VARCHAR(36) DEFAULT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  ParentID INT DEFAULT NULL,
-  ParentUUID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate INT DEFAULT NULL,
-  LinkNum INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Text VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  SitName VARCHAR(255) DEFAULT NULL,
-  TouchName VARCHAR(255) DEFAULT NULL,
-  ObjectFlags INT DEFAULT NULL,
-  OwnerMask INT DEFAULT NULL,
-  NextOwnerMask INT DEFAULT NULL,
-  GroupMask INT DEFAULT NULL,
-  EveryoneMask INT DEFAULT NULL,
-  BaseMask INT DEFAULT NULL,
-  Material TINYINT DEFAULT NULL,  
-  ScriptAccessPin INT DEFAULT NULL,
-  TextureAnimation BLOB,
-  ParticleSystem BLOB,
-  ClickAction TINYINT DEFAULT NULL,  
-  Color INT DEFAULT NULL,
-  PositionX DOUBLE DEFAULT NULL,
-  PositionY DOUBLE DEFAULT NULL,
-  PositionZ DOUBLE DEFAULT NULL,
-  GroupPositionX DOUBLE DEFAULT NULL,
-  GroupPositionY DOUBLE DEFAULT NULL,
-  GroupPositionZ DOUBLE DEFAULT NULL,
-  VelocityX DOUBLE DEFAULT NULL,
-  VelocityY DOUBLE DEFAULT NULL,
-  VelocityZ DOUBLE DEFAULT NULL,
-  AngularVelocityX DOUBLE DEFAULT NULL,
-  AngularVelocityY DOUBLE DEFAULT NULL,
-  AngularVelocityZ DOUBLE DEFAULT NULL,
-  AccelerationX DOUBLE DEFAULT NULL,
-  AccelerationY DOUBLE DEFAULT NULL,
-  AccelerationZ DOUBLE DEFAULT NULL,
-  RotationX DOUBLE DEFAULT NULL,
-  RotationY DOUBLE DEFAULT NULL,
-  RotationZ DOUBLE DEFAULT NULL,
-  RotationW DOUBLE DEFAULT NULL,
-  SitTargetOffsetX DOUBLE DEFAULT NULL,
-  SitTargetOffsetY DOUBLE DEFAULT NULL,
-  SitTargetOffsetZ DOUBLE DEFAULT NULL,
-  SitTargetOrientW DOUBLE DEFAULT NULL,
-  SitTargetOrientX DOUBLE DEFAULT NULL,
-  SitTargetOrientY DOUBLE DEFAULT NULL,
-  SitTargetOrientZ DOUBLE DEFAULT NULL,
-  -- this is the shape
-  Shape INT DEFAULT NULL,
-  ScaleX DOUBLE DEFAULT NULL,
-  ScaleY DOUBLE DEFAULT NULL,
-  ScaleZ DOUBLE DEFAULT NULL,
-  PCode INT DEFAULT NULL,
-  PathBegin INT DEFAULT NULL,
-  PathEnd INT DEFAULT NULL,
-  PathScaleX INT DEFAULT NULL,
-  PathScaleY INT DEFAULT NULL,
-  PathShearX INT DEFAULT NULL,
-  PathShearY INT DEFAULT NULL,
-  PathSkew INT DEFAULT NULL,
-  PathCurve INT DEFAULT NULL,
-  PathRadiusOffset INT DEFAULT NULL,
-  PathRevolutions INT DEFAULT NULL,
-  PathTaperX INT DEFAULT NULL,
-  PathTaperY INT DEFAULT NULL,
-  PathTwist INT DEFAULT NULL,
-  ProfileBegin INT DEFAULT NULL,
-  ProfileEnd INT DEFAULT NULL,
-  ProfileCurve INT DEFAULT NULL,
-  ProfileHollow INT DEFAULT NULL,
-  State INT DEFAULT NULL,
-  Texture BLOB,
-  ExtraParams BLOB,
-  PRIMARY KEY (UUID)
-);
-
-CREATE INDEX PrimsRegionIdIndex ON Prims (RegionID);
-CREATE INDEX PrimsRegionParentUuidIndex ON Prims (ParentUUID);
-
-CREATE TABLE Terrain (
-  RegionID VARCHAR(36) NOT NULL,
-  MapData BLOB,
-  PRIMARY KEY (RegionID)
-);
-
-CREATE TABLE PrimItems (
-  ItemID VARCHAR(36) NOT NULL,
-  GroupID VARCHAR(36) DEFAULT NULL,
-  PrimID VARCHAR(36) DEFAULT NULL,
-  ParentFolderID VARCHAR(36) DEFAULT NULL,
-  AssetID VARCHAR(36) DEFAULT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  LastOwnerID VARCHAR(36) DEFAULT NULL,
-  CreatorID VARCHAR(36) DEFAULT NULL,
-  CreationDate BIGINT DEFAULT NULL,
-  Type INT DEFAULT NULL,
-  InvType INT DEFAULT NULL,
-  Name VARCHAR(255) DEFAULT NULL,
-  Description VARCHAR(255) DEFAULT NULL,
-  NextPermissions INT DEFAULT NULL,
-  CurrentPermissions INT DEFAULT NULL,
-  BasePermissions INT DEFAULT NULL,
-  EveryonePermissions INT DEFAULT NULL,
-  GroupPermissions INT DEFAULT NULL,
-  Flags INT DEFAULT NULL,
-  PRIMARY KEY (ItemID)
-);
-
-CREATE INDEX PrimItemsPrimIdIndex ON PrimItems (PrimID);
-
-CREATE TABLE RegionSettings (
-  RegionID VARCHAR(36) NOT NULL,
-  
-  BlockTerraform BIT DEFAULT NULL,
-  BlockFly BIT DEFAULT NULL,
-  AllowDamage BIT DEFAULT NULL,
-  RestrictPushing BIT DEFAULT NULL,
-  AllowLandResell BIT DEFAULT NULL,
-  AllowLandJoinDivide BIT DEFAULT NULL,
-  BlockShowInSearch BIT DEFAULT NULL,
-  
-  AgentLimit INT DEFAULT NULL,
-  ObjectBonus DOUBLE DEFAULT NULL,
-  Maturity INT DEFAULT NULL,
-  
-  DisableScripts BIT DEFAULT NULL,
-  DisableCollisions BIT DEFAULT NULL,
-  DisablePhysics BIT DEFAULT NULL,
-
-  TerrainTexture1 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture2 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture3 VARCHAR(36) DEFAULT NULL,
-  TerrainTexture4 VARCHAR(36) DEFAULT NULL,
-
-  Elevation1NW DOUBLE DEFAULT NULL,
-  Elevation2NW DOUBLE DEFAULT NULL,
-  Elevation1NE DOUBLE DEFAULT NULL,
-  Elevation2NE DOUBLE DEFAULT NULL,
-  Elevation1SE DOUBLE DEFAULT NULL,
-  Elevation2SE DOUBLE DEFAULT NULL,
-  Elevation1SW DOUBLE DEFAULT NULL,
-  Elevation2SW DOUBLE DEFAULT NULL,
-  
-  WaterHeight DOUBLE DEFAULT NULL,
-  TerrainRaiseLimit DOUBLE DEFAULT NULL,
-  TerrainLowerLimit DOUBLE DEFAULT NULL,    
-
-  UseEstateSun BIT DEFAULT NULL,
-  Sandbox BIT DEFAULT NULL,
-
-  SunVectorX DOUBLE DEFAULT NULL,
-  SunVectorY DOUBLE DEFAULT NULL,
-  SunVectorZ DOUBLE DEFAULT NULL,
- 
-  FixedSun BIT DEFAULT NULL, 
-  SunPosition DOUBLE DEFAULT NULL, 
- 
-  Covenant VARCHAR(36) DEFAULT NULL,
-   
-  PRIMARY KEY  (RegionID)
-);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql
deleted file mode 100644
index 6084886..0000000
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_UserStore.sql
+++ /dev/null
@@ -1,104 +0,0 @@
-CREATE TABLE UserAgents (
-  ProfileID VARCHAR(36) NOT NULL,
-  AgentIP VARCHAR(24) DEFAULT NULL,
-  AgentPort INT DEFAULT NULL,
-  AgentOnline BIT DEFAULT NULL,
-  SessionID VARCHAR(36) DEFAULT NULL,
-  SecureSessionID VARCHAR(36) DEFAULT NULL,
-  InitialRegion VARCHAR(255) DEFAULT NULL,
-  Region VARCHAR(255) DEFAULT NULL,
-  LoginTime INT DEFAULT NULL,
-  LogoutTime INT DEFAULT NULL,
-  Handle BIGINT DEFAULT NULL,
-  PositionX DOUBLE DEFAULT NULL,
-  PositionY DOUBLE DEFAULT NULL,
-  PositionZ DOUBLE DEFAULT NULL,
-  LookAtX DOUBLE DEFAULT NULL,
-  LookAtY DOUBLE DEFAULT NULL,
-  LookAtZ DOUBLE DEFAULT NULL,  
-  PRIMARY KEY (ProfileID)
-);
-
-CREATE TABLE UserProfiles (
-  ID VARCHAR(36) NOT NULL,
-  WebLoginKey VARCHAR(36) DEFAULT NULL,
-  FirstName VARCHAR(32) DEFAULT NULL,
-  SurName VARCHAR(32) DEFAULT NULL,
-  Email VARCHAR(250) DEFAULT NULL,
-  PasswordHash VARCHAR(32) DEFAULT NULL,
-  PasswordSalt VARCHAR(32) DEFAULT NULL,
-  HomeRegionID VARCHAR(36) DEFAULT NULL,
-  HomeRegionX INT DEFAULT NULL,
-  HomeRegionY INT DEFAULT NULL,
-  HomeLocationX DOUBLE DEFAULT NULL,
-  HomeLocationY DOUBLE DEFAULT NULL,
-  HomeLocationZ DOUBLE DEFAULT NULL,
-  HomeLookAtX DOUBLE DEFAULT NULL,
-  HomeLookAtY DOUBLE DEFAULT NULL,
-  HomeLookAtZ DOUBLE DEFAULT NULL,
-  Created INT DEFAULT NULL,
-  LastLogin INT DEFAULT NULL,
-  UserInventoryURI VARCHAR(255) DEFAULT NULL,
-  UserAssetURI VARCHAR(255) DEFAULT NULL,
-  Image VARCHAR(36) DEFAULT NULL,
-  FirstLifeImage VARCHAR(36) DEFAULT NULL,
-  AboutText TEXT DEFAULT NULL,
-  FirstLifeAboutText TEXT DEFAULT NULL,
-  CanDoMask INT DEFAULT NULL,
-  WantDoMask INT DEFAULT NULL,
-  UserFlags INT DEFAULT NULL,
-  GodLevel INT DEFAULT NULL,  
-  CustomType VARCHAR(32) DEFAULT NULL,
-  Partner VARCHAR(36) DEFAULT NULL,
-  RootInventoryFolderID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY (ID)
-);
-
-CREATE INDEX UserSurnameIndex ON UserProfiles (SurName);
-CREATE INDEX UserFirstNameIndex ON UserProfiles (FirstName);
-CREATE UNIQUE INDEX UserFullNameIndex ON UserProfiles (SurName,FirstName);
-
-CREATE TABLE UserAppearances (
-  Owner VARCHAR(36) NOT NULL,
-  BodyItem VARCHAR(36) DEFAULT NULL,
-  BodyAsset VARCHAR(36) DEFAULT NULL,
-  SkinItem VARCHAR(36) DEFAULT NULL,
-  SkinAsset VARCHAR(36) DEFAULT NULL,
-  HairItem VARCHAR(36) DEFAULT NULL,
-  HairAsset VARCHAR(36) DEFAULT NULL,
-  EyesItem VARCHAR(36) DEFAULT NULL,
-  EyesAsset VARCHAR(36) DEFAULT NULL,
-  ShirtItem VARCHAR(36) DEFAULT NULL,
-  ShirtAsset VARCHAR(36) DEFAULT NULL,
-  PantsItem VARCHAR(36) DEFAULT NULL,
-  PantsAsset VARCHAR(36) DEFAULT NULL,
-  ShoesItem VARCHAR(36) DEFAULT NULL,
-  ShoesAsset VARCHAR(36) DEFAULT NULL,
-  SocksItem VARCHAR(36) DEFAULT NULL,
-  SocksAsset VARCHAR(36) DEFAULT NULL,
-  JacketItem VARCHAR(36) DEFAULT NULL,
-  JacketAsset VARCHAR(36) DEFAULT NULL,
-  GlovesItem VARCHAR(36) DEFAULT NULL,
-  GlovesAsset VARCHAR(36) DEFAULT NULL,
-  UnderShirtItem VARCHAR(36) DEFAULT NULL,
-  UnderShirtAsset VARCHAR(36) DEFAULT NULL,
-  UnderPantsItem VARCHAR(36) DEFAULT NULL,
-  UnderPantsAsset VARCHAR(36) DEFAULT NULL,
-  SkirtItem VARCHAR(36) DEFAULT NULL,
-  SkirtAsset VARCHAR(36) DEFAULT NULL,
-  Texture BLOB,
-  VisualParams BLOB,
-  Serial INT DEFAULT NULL,
-  AvatarHeight FLOAT DEFAULT NULL,    
-  PRIMARY KEY (Owner)
-);
-
-CREATE TABLE UserFriends (
-  UserFriendID VARCHAR(36) NOT NULL,
-  OwnerID VARCHAR(36) DEFAULT NULL,
-  FriendID VARCHAR(36) DEFAULT NULL,
-  FriendPermissions INT DEFAULT NULL,
-  PRIMARY KEY (UserFriendID)  
-);
-
-CREATE UNIQUE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID);  
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
deleted file mode 100644
index 70b6998..0000000
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false">
-        <id name="ProfileID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-      
-        <property name="AgentIP" type="String" length="24" />
-        <property name="AgentPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="AgentOnline" type="boolean" />
-        <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="InitialRegion" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Region" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="LoginTime" type="Int32" />
-        <property name="LogoutTime" type="Int32" />
-        <property name="Handle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-
-        <property name="Position" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="PositionX" />
-          <column name="PositionY" />
-          <column name="PositionZ" />
-        </property>
-        
-        <property name="LookAt" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
-          <column name="LookAtX" />
-          <column name="LookAtY" />
-          <column name="LookAtZ" />
-        </property>
-        
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
deleted file mode 100644
index 21e547f..0000000
--- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-  <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false">
-    <id name="Owner" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-      <generator class="assigned" /> 
-    </id>
-    <property name="BodyItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="BodyAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SkinItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SkinAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="HairItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="HairAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="EyesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="EyesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="ShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="ShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="PantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="PantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="ShoesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="ShoesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SocksItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SocksAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="JacketItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="JacketAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="GlovesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="GlovesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SkirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SkirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" />
-    <property name="VisualParams" type="binary" />
-    <property name="Serial" type="Int32" />
-    <property name="AvatarHeight" type="Single" />
-  </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserFriend.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserFriend.hbm.xml
deleted file mode 100644
index cb23858..0000000
--- a/OpenSim/Data/NHibernate/Resources/UserFriend.hbm.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Data.NHibernate.UserFriend, OpenSim.Data.NHibernate" table="UserFriends" lazy="false">
-        <id name="UserFriendID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-        <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="FriendID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="FriendPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
deleted file mode 100644
index 5b1f9b0..0000000
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id>
-        <property name="WebLoginKey" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="FirstName" index="UserFirstNameIndex" type="String" length="32" />
-        <property name="SurName" index="UserSurnameIndex" type="String" length="32" />
-        <property name="Email" type="String" length="250" />
-        <property name="PasswordHash" type="String" length="32" />
-        <property name="PasswordSalt" type="String" length="32" />
-        <property name="HomeRegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="HomeRegionX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="HomeRegionY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="HomeLocationX" type="Single" />
-        <property name="HomeLocationY" type="Single" />
-        <property name="HomeLocationZ" type="Single" />
-        <property name="HomeLookAtX" type="Single" />
-        <property name="HomeLookAtY" type="Single" />
-        <property name="HomeLookAtZ" type="Single" />
-        <property name="Created" type="Int32" />
-        <property name="LastLogin" type="Int32" />
-        <property name="UserInventoryURI" type="String" length="255"/>
-        <property name="UserAssetURI" type="String" length="255"/>
-        <property name="Image" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="AboutText" type="String" length="255" />
-        <property name="FirstLifeAboutText" type="String" length="255" />
-        <property name="CanDoMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="WantDoMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-        <property name="UserFlags" type="Int32" />
-        <property name="GodLevel" type="Int32" />
-        <property name="CustomType" type="String" length="32" />
-        <property name="Partner" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
-    </class>
-</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs
deleted file mode 100644
index 92ab0ba..0000000
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class SByteType: IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object sbyte1, object sbyte2)
-        {
-            return sbyte1.Equals(sbyte2);
-        }
-
-        public object DeepCopy(object sbyte1)
-        {
-            return sbyte1;
-        }
-
-        public object Disassemble(object sbyte1)
-        {
-            return sbyte1;
-        }
-
-        public int GetHashCode(object sbyte1)
-        {
-            return (sbyte1 == null) ? 0 : sbyte1.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object sbyte1 = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                object tempO = rs.GetValue(ord);
-                if (tempO is Byte)
-                {
-                    sbyte1 = Convert.ToSByte(((byte)tempO));
-                }
-                else
-                {
-                    short temp = rs.GetInt16(ord);
-                    sbyte1 = Convert.ToSByte(temp);
-                }
-            }
-            return sbyte1;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            sbyte b = (sbyte)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = Convert.ToInt16(b);
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(sbyte); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Byte.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
deleted file mode 100644
index 4be35c6..0000000
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-    public class Terrain
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private double[,] map;
-        private UUID regionID;
-
-        public Terrain(UUID Region, double[,] array)
-        {
-            map = array;
-            regionID = Region;
-        }
-
-        public Terrain()
-        {
-            map = new double[Constants.RegionSize, Constants.RegionSize];
-            map.Initialize();
-            regionID = UUID.Zero;
-        }
-
-        public UUID RegionID
-        {
-            get { return regionID; }
-            set { regionID = value; }
-        }
-
-        public byte[] MapData
-        {
-            get { return serializeTerrain(map); }
-            set { map = parseTerrain(value); }
-        }
-
-        public double[,] Doubles
-        {
-            get {return map;}
-            set {map = value;}
-        }
-
-        private static double[,] parseTerrain(byte[] data)
-        {
-            double[,] terret = new double[Constants.RegionSize, Constants.RegionSize];
-            terret.Initialize();
-
-            MemoryStream str = new MemoryStream(data);
-            BinaryReader br = new BinaryReader(str);
-            try {
-                for (int x = 0; x < Constants.RegionSize; x++)
-                {
-                    for (int y = 0; y < Constants.RegionSize; y++)
-                    {
-                        terret[x, y] = br.ReadDouble();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error("Issue parsing Map", e);
-            }
-            return terret;
-        }
-
-        private static byte[] serializeTerrain(double[,] val)
-        {
-            MemoryStream str = new MemoryStream((int) ((Constants.RegionSize*Constants.RegionSize)*sizeof (double)));
-            BinaryWriter bw = new BinaryWriter(str);
-
-            // TODO: COMPATIBILITY - Add byte-order conversions
-            for (int x = 0; x < Constants.RegionSize; x++)
-            {
-                for (int y = 0; y < Constants.RegionSize; y++)
-                {
-                    double height = val[x, y];
-                    if (height <= 0.0)
-                        height = double.Epsilon;
-
-                    bw.Write(height);
-                }
-            }
-            return str.ToArray();
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
deleted file mode 100644
index 89c9567..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlAssetTest : BasicAssetTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "MsSql2005Dialect;SqlClientDriver;Data Source=127.0.0.1;Network Library=DBMSSOCN;Initial Catalog=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-                db = new NHibernateAssetData();
-                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
deleted file mode 100644
index 6d431a7..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlEstateTest : BasicEstateTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "MsSql2005Dialect;SqlClientDriver;Data Source=127.0.0.1;Network Library=DBMSSOCN;Initial Catalog=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-                db = new NHibernateEstateData();
-                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                ((NHibernateEstateData)db).Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
deleted file mode 100644
index 30280af..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlGridTest : BasicGridTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
-            {
-                db = new NHibernateGridData();
-                db.Initialise(connect);
-                database = ((NHibernateGridData)db).Manager;
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
deleted file mode 100644
index 6d60006..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlInventoryTest : BasicInventoryTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateInventoryData();
-                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
deleted file mode 100644
index 9a9c41d..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlRegionTest : BasicRegionTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateRegionData();
-                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
deleted file mode 100644
index cd861de..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMsSqlUserTest : BasicUserTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateUserData();
-                db.Initialise(connect);
-                database = ((NHibernateUserData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
deleted file mode 100644
index 7c7b5f7..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLAssetTest : BasicAssetTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateAssetData();
-                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
deleted file mode 100644
index dbb1d14..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLGridTest : BasicGridTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
-            {
-                db = new NHibernateGridData();
-                db.Initialise(connect);
-                database = ((NHibernateGridData)db).Manager;
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
deleted file mode 100644
index 6c31a63..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLInventoryTest : BasicInventoryTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateInventoryData();
-                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
deleted file mode 100644
index 28660d9..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLRegionTest : BasicRegionTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateRegionData();
-                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
deleted file mode 100644
index d5caa3e..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLUserTest : BasicUserTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateUserData();
-                db.Initialise(connect);
-                database = ((NHibernateUserData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
deleted file mode 100644
index 72b4320..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateMySQLEstateTest : BasicEstateTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateEstateData();
-                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                ((NHibernateEstateData)db).Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
deleted file mode 100644
index d1ec3d0..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLAssetTest : BasicAssetTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateAssetData();
-                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
deleted file mode 100644
index fdd99ab..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLEstateTest : BasicEstateTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateEstateData();
-                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                ((NHibernateEstateData)db).Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
deleted file mode 100644
index fe874cb..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLGridTest : BasicGridTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
-            {
-                db = new NHibernateGridData();
-                db.Initialise(connect);
-                database = ((NHibernateGridData)db).Manager;
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
deleted file mode 100644
index 048d36f..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateInventoryData();
-                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
deleted file mode 100644
index 76b6fea..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLRegionTest : BasicRegionTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-                
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateRegionData();
-                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
deleted file mode 100644
index c437cd8..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernatePostgreSQLUserTest : BasicUserTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                db = new NHibernateUserData();
-                db.Initialise(connect);
-                database = ((NHibernateUserData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
deleted file mode 100644
index c8d6e75..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteAssetTest : BasicAssetTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
-
-                db = new NHibernateAssetData();
-                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
deleted file mode 100644
index 345db84..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteEstateTest : BasicEstateTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
-
-                db = new NHibernateEstateData();
-                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                ((NHibernateEstateData)db).Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
deleted file mode 100644
index 24a19c9..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteGridTest : BasicGridTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
-            {
-                db = new NHibernateGridData();
-                db.Initialise(connect);
-                database = ((NHibernateGridData)db).Manager;
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
deleted file mode 100644
index ec15c55..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteInventoryTest : BasicInventoryTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
-
-                db = new NHibernateInventoryData();
-                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
deleted file mode 100644
index 692ba5a..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteRegionTest : BasicRegionTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
-
-                db = new NHibernateRegionData();
-                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-        
-    }
-}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
deleted file mode 100644
index 32a5bbe..0000000
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-
-namespace OpenSim.Data.NHibernate.Tests
-{
-
-    [TestFixture, DatabaseTest]
-    public class NHibernateSQLiteUserTest : BasicUserTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public NHibernateManager database;
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; 
-                
-                db = new NHibernateUserData();
-                db.Initialise(connect);
-                database = ((NHibernateUserData)db).Manager;
-            } 
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                Assert.Ignore();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            if (database != null)
-            {
-                database.DropSchema();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
deleted file mode 100644
index 57a5296..0000000
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class TextureUserType: IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object texture1, object texture2)
-        {
-            return texture1.Equals(texture2);
-        }
-
-        public object DeepCopy(object texture)
-        {
-            if (texture == null) 
-            {
-                // TODO: should parametrize this texture out
-                return new Primitive.TextureEntry(new UUID(Constants.DefaultTexture));
-            }
-            else 
-            {
-                byte[] bytes = ((Primitive.TextureEntry)texture).GetBytes();
-                return new Primitive.TextureEntry(bytes, 0, bytes.Length);
-            }
-        }
-
-        public object Disassemble(object texture)
-        {
-            return texture;
-        }
-
-        public int GetHashCode(object texture)
-        {
-            return (texture == null) ? 0 : texture.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object texture = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                byte[] bytes = (byte[])rs[ord];
-                texture = new Primitive.TextureEntry(bytes, 0, bytes.Length);
-            }
-
-            return texture;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = texture.GetBytes();
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(Primitive.TextureEntry); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Binary.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/UInt16Type.cs b/OpenSim/Data/NHibernate/UInt16Type.cs
deleted file mode 100644
index 8e17463..0000000
--- a/OpenSim/Data/NHibernate/UInt16Type.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class UInt16Type : IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object uint1, object uint2)
-        {
-            return uint1.Equals(uint2);
-        }
-
-        public object DeepCopy(object uint1)
-        {
-            return uint1;
-        }
-
-        public object Disassemble(object uint1)
-        {
-            return uint1;
-        }
-
-        public int GetHashCode(object uint1)
-        {
-            return (uint1 == null) ? 0 : uint1.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object uint1 = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                uint1 = (UInt16)rs.GetInt32(ord);
-            }
-
-            return uint1;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            UInt16 uint1 = (UInt16)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = Convert.ToInt32(uint1);
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(UInt16); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/UInt32Type.cs b/OpenSim/Data/NHibernate/UInt32Type.cs
deleted file mode 100644
index 6b1cb36..0000000
--- a/OpenSim/Data/NHibernate/UInt32Type.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class UInt32Type : IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object uint1, object uint2)
-        {
-            return uint1.Equals(uint2);
-        }
-
-        public object DeepCopy(object uint1)
-        {
-            return uint1;
-        }
-
-        public object Disassemble(object uint1)
-        {
-            return uint1;
-        }
-
-        public int GetHashCode(object uint1)
-        {
-            return (uint1 == null) ? 0 : uint1.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object uint1 = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                uint1 = (UInt32)rs.GetInt32(ord);
-            }
-
-            return uint1;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            UInt32 uint1 = (UInt32)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = Convert.ToInt32(uint1);
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(UInt32); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/UInt64Type.cs b/OpenSim/Data/NHibernate/UInt64Type.cs
deleted file mode 100644
index 6484367..0000000
--- a/OpenSim/Data/NHibernate/UInt64Type.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Data;
-using NHibernate;
-using NHibernate.SqlTypes;
-using NHibernate.UserTypes;
-
-namespace OpenSim.Data.NHibernate
-{
-    [Serializable]
-    public class UInt64Type : IUserType
-    {
-        public object Assemble(object cached, object owner)
-        {
-            return cached;
-        }
-
-        bool IUserType.Equals(object uint1, object uint2)
-        {
-            return uint1.Equals(uint2);
-        }
-
-        public object DeepCopy(object uint1)
-        {
-            return uint1;
-        }
-
-        public object Disassemble(object uint1)
-        {
-            return uint1;
-        }
-
-        public int GetHashCode(object uint1)
-        {
-            return (uint1 == null) ? 0 : uint1.GetHashCode();
-        }
-
-        public bool IsMutable
-        {
-            get { return false; }
-        }
-
-        public object NullSafeGet(IDataReader rs, string[] names, object owner)
-        {
-            object uint1 = null;
-
-            int ord = rs.GetOrdinal(names[0]);
-            if (!rs.IsDBNull(ord))
-            {
-                uint1 = (UInt64)rs.GetInt64(ord);
-            }
-
-            return uint1;
-        }
-
-        public void NullSafeSet(IDbCommand cmd, object obj, int index)
-        {
-            UInt64 uint1 = (UInt64)obj;
-            ((IDataParameter)cmd.Parameters[index]).Value = Convert.ToInt64(uint1);
-        }
-
-        public object Replace(object original, object target, object owner)
-        {
-            return original;
-        }
-
-        public Type ReturnedType
-        {
-            get { return typeof(UInt64); }
-        }
-
-        public SqlType[] SqlTypes
-        {
-            get { return new SqlType [] { NHibernateUtil.Int64.SqlType }; }
-        }
-    }
-}
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs
deleted file mode 100644
index f0868a1..0000000
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 OpenMetaverse;
-
-namespace OpenSim.Data.NHibernate
-{
-    public class UserFriend
-    {
-        public UserFriend()
-        {
-        }
-
-        public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions)
-        {
-            this.UserFriendID = userFriendID;
-            this.OwnerID = ownerID;
-            this.FriendID = friendID;
-            this.FriendPermissions = friendPermissions;
-        }
-
-        private UUID userFriendId;
-        public UUID UserFriendID
-        { 
-            get { return userFriendId; } 
-            set { userFriendId = value; } 
-        }
-        private UUID ownerId;
-        public UUID OwnerID
-        {
-            get { return ownerId; }
-            set { ownerId = value; }
-        }
-        private UUID friendId;
-        public UUID FriendID
-        {
-            get { return friendId; }
-            set { friendId = value; }
-        }
-        private uint friendPermissions;
-        public uint FriendPermissions
-        {
-            get { return friendPermissions; }
-            set { friendPermissions = value; }
-        }
-
-    }
-}
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 97990e1..60a8874 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -323,7 +323,6 @@ namespace OpenSim.Data.Tests
             sop.ObjectFlags = 0;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            sog.SetScene(scene); // Reguired by nhibernate database module.
             
             // Inserts group in DB
             db.StoreObject(sog,region3);
diff --git a/OpenSim/Data/Tests/DataTestUtil.cs b/OpenSim/Data/Tests/DataTestUtil.cs
index f781ea6..d211ab3 100644
--- a/OpenSim/Data/Tests/DataTestUtil.cs
+++ b/OpenSim/Data/Tests/DataTestUtil.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Tests
     public class DataTestUtil
     {
         public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
-        public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue / 2; // NHibernate does not support unsigned integer range.
+        public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue;
 
         public const int INTEGER_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue
         public const int INTEGER_MAX = int.MaxValue;
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index a74169e..97b3b60 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -403,7 +403,7 @@ namespace OpenSim.Framework.Communications
             /// In case, we are invoked asynchroneously this object will keep track of the state
             /// </summary>
             AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state);
-            ThreadPool.QueueUserWorkItem(RequestHelper, ar);
+            Util.FireAndForget(RequestHelper, ar);
             return ar;
         }
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 9fd043c..d304345 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -448,6 +448,10 @@ namespace OpenSim.Framework
     public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
+    public delegate void AgentFOV(IClientAPI client, float verticalAngle);
+
+    public delegate double UpdatePriorityHandler(UpdatePriorityData data);
+
     #endregion
 
     public struct DirPlacesReplyData
@@ -517,6 +521,232 @@ namespace OpenSim.Framework
         public float dwell;
     }
 
+    public struct SendAvatarData
+    {
+        public readonly ulong RegionHandle;
+        public readonly string FirstName;
+        public readonly string LastName;
+        public readonly string GroupTitle;
+        public readonly UUID AvatarID;
+        public readonly uint AvatarLocalID;
+        public readonly Vector3 Position;
+        public readonly byte[] TextureEntry;
+        public readonly uint ParentID;
+        public readonly Quaternion Rotation;
+
+        public SendAvatarData(ulong regionHandle, string firstName, string lastName, string groupTitle, UUID avatarID,
+            uint avatarLocalID, Vector3 position, byte[] textureEntry, uint parentID, Quaternion rotation)
+        {
+            RegionHandle = regionHandle;
+            FirstName = firstName;
+            LastName = lastName;
+            GroupTitle = groupTitle;
+            AvatarID = avatarID;
+            AvatarLocalID = avatarLocalID;
+            Position = position;
+            TextureEntry = textureEntry;
+            ParentID = parentID;
+            Rotation = rotation;
+        }
+    }
+
+    public struct SendAvatarTerseData
+    {
+        public readonly ulong RegionHandle;
+        public readonly ushort TimeDilation;
+        public readonly uint LocalID;
+        public readonly Vector3 Position;
+        public readonly Vector3 Velocity;
+        public readonly Vector3 Acceleration;
+        public readonly Quaternion Rotation;
+        public readonly Vector4 CollisionPlane;
+        public readonly UUID AgentID;
+        public readonly byte[] TextureEntry;
+        public readonly double Priority;
+
+        public SendAvatarTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity,
+            Vector3 acceleration, Quaternion rotation, Vector4 collisionPlane, UUID agentid, byte[] textureEntry, double priority)
+        {
+            RegionHandle = regionHandle;
+            TimeDilation = timeDilation;
+            LocalID = localID;
+            Position = position;
+            Velocity = velocity;
+            Acceleration = acceleration;
+            Rotation = rotation;
+            CollisionPlane = collisionPlane;
+            AgentID = agentid;
+            TextureEntry = textureEntry;
+            Priority = priority;
+        }
+    }
+
+    public struct SendPrimitiveTerseData
+    {
+        public readonly ulong RegionHandle;
+        public readonly ushort TimeDilation;
+        public readonly uint LocalID;
+        public readonly Vector3 Position;
+        public readonly Quaternion Rotation;
+        public readonly Vector3 Velocity;
+        public readonly Vector3 Acceleration;
+        public readonly Vector3 AngularVelocity;
+        public readonly byte State;
+        public readonly UUID AssetID;
+        public readonly UUID OwnerID;
+        public readonly int AttachPoint;
+        public readonly byte[] TextureEntry;
+        public readonly double Priority;
+
+        public SendPrimitiveTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
+            Quaternion rotation, Vector3 velocity, Vector3 acceleration, Vector3 rotationalvelocity, byte state,
+            UUID assetID, UUID ownerID, int attachPoint, byte[] textureEntry, double priority)
+        {
+            RegionHandle = regionHandle;
+            TimeDilation = timeDilation;
+            LocalID = localID;
+            Position = position;
+            Rotation = rotation;
+            Velocity = velocity;
+            Acceleration = acceleration;
+            AngularVelocity = rotationalvelocity;
+            State = state;
+            AssetID = assetID;
+            OwnerID = ownerID;
+            AttachPoint = attachPoint;
+            TextureEntry = textureEntry;
+            Priority = priority;
+        }
+    }
+
+    public struct SendPrimitiveData
+    {
+        private ulong m_regionHandle;
+        private ushort m_timeDilation;
+        private uint m_localID;
+        private PrimitiveBaseShape m_primShape;
+        private Vector3 m_pos;
+        private Vector3 m_vel;
+        private Vector3 m_acc;
+        private Quaternion m_rotation;
+        private Vector3 m_rvel;
+        private PrimFlags m_flags;
+        private UUID m_objectID;
+        private UUID m_ownerID;
+        private string m_text;
+        private byte[] m_color;
+        private uint m_parentID;
+        private byte[] m_particleSystem;
+        private byte m_clickAction;
+        private byte m_material;
+        private byte[] m_textureanim;
+        private bool m_attachment;
+        private uint m_AttachPoint;
+        private UUID m_AssetId;
+        private UUID m_SoundId;
+        private double m_SoundVolume;
+        private byte m_SoundFlags;
+        private double m_SoundRadius;
+        private double m_priority;
+
+        public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
+                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
+                                   uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
+                                   uint parentID, byte[] particleSystem, byte clickAction, byte material, double priority) :
+            this(regionHandle, timeDilation, localID, primShape, pos, vel, acc, rotation, rvel, flags, objectID,
+            ownerID, text, color, parentID, particleSystem, clickAction, material, new byte[0], false, 0, UUID.Zero,
+            UUID.Zero, 0, 0, 0, priority) { }
+
+        public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
+                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
+                                   uint flags,
+                                   UUID objectID, UUID ownerID, string text, byte[] color, uint parentID,
+                                   byte[] particleSystem,
+                                   byte clickAction, byte material, byte[] textureanim, bool attachment,
+                                   uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags,
+                                   double SoundRadius, double priority)
+        {
+            this.m_regionHandle = regionHandle;
+            this.m_timeDilation = timeDilation;
+            this.m_localID = localID;
+            this.m_primShape = primShape;
+            this.m_pos = pos;
+            this.m_vel = vel;
+            this.m_acc = acc;
+            this.m_rotation = rotation;
+            this.m_rvel = rvel;
+            this.m_flags = (PrimFlags)flags;
+            this.m_objectID = objectID;
+            this.m_ownerID = ownerID;
+            this.m_text = text;
+            this.m_color = color;
+            this.m_parentID = parentID;
+            this.m_particleSystem = particleSystem;
+            this.m_clickAction = clickAction;
+            this.m_material = material;
+            this.m_textureanim = textureanim;
+            this.m_attachment = attachment;
+            this.m_AttachPoint = AttachPoint;
+            this.m_AssetId = AssetId;
+            this.m_SoundId = SoundId;
+            this.m_SoundVolume = SoundVolume;
+            this.m_SoundFlags = SoundFlags;
+            this.m_SoundRadius = SoundRadius;
+            this.m_priority = priority;
+        }
+
+        public ulong regionHandle { get { return this.m_regionHandle; } }
+        public ushort timeDilation { get { return this.m_timeDilation; } }
+        public uint localID { get { return this.m_localID; } }
+        public PrimitiveBaseShape primShape { get { return this.m_primShape; } }
+        public Vector3 pos { get { return this.m_pos; } }
+        public Vector3 vel { get { return this.m_vel; } }
+        public Vector3 acc { get { return this.m_acc; } }
+        public Quaternion rotation { get { return this.m_rotation; } }
+        public Vector3 rvel { get { return this.m_rvel; } }
+        public PrimFlags flags { get { return this.m_flags; } }
+        public UUID objectID { get { return this.m_objectID; } }
+        public UUID ownerID { get { return this.m_ownerID; } }
+        public string text { get { return this.m_text; } }
+        public byte[] color { get { return this.m_color; } }
+        public uint parentID { get { return this.m_parentID; } }
+        public byte[] particleSystem { get { return this.m_particleSystem; } }
+        public byte clickAction { get { return this.m_clickAction; } }
+        public byte material { get { return this.m_material; } }
+        public byte[] textureanim { get { return this.m_textureanim; } }
+        public bool attachment { get { return this.m_attachment; } }
+        public uint AttachPoint { get { return this.m_AttachPoint; } }
+        public UUID AssetId { get { return this.m_AssetId; } }
+        public UUID SoundId { get { return this.m_SoundId; } }
+        public double SoundVolume { get { return this.m_SoundVolume; } }
+        public byte SoundFlags { get { return this.m_SoundFlags; } }
+        public double SoundRadius { get { return this.m_SoundRadius; } }
+        public double priority { get { return this.m_priority; } }
+    }
+
+    public struct UpdatePriorityData {
+        private double m_priority;
+        private uint m_localID;
+
+        public UpdatePriorityData(double priority, uint localID) {
+            this.m_priority = priority;
+            this.m_localID = localID;
+        }
+
+        public double priority { get { return this.m_priority; } }
+        public uint localID { get { return this.m_localID; } }
+    }
+
+    [Flags]
+    public enum StateUpdateTypes
+    {
+        None = 0,
+        AvatarTerse = 1,
+        PrimitiveTerse = AvatarTerse << 1,
+        PrimitiveFull = PrimitiveTerse << 1,
+        All = AvatarTerse | PrimitiveTerse | PrimitiveFull,
+    }
+
     public interface IClientAPI
     {
         Vector3 StartPos { get; set; }
@@ -878,37 +1108,20 @@ namespace OpenSim.Framework
         void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance);
         void SendPayPrice(UUID objectID, int[] payPrice);
 
-        void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
-                            uint avatarLocalID,
-                            Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation);
+        void SendAvatarData(SendAvatarData data);
 
-        void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-                                   Vector3 velocity, Quaternion rotation, UUID agentid);
+        void SendAvatarTerseUpdate(SendAvatarTerseData data);
 
         void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
 
         void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID);
         void SetChildAgentThrottle(byte[] throttle);
 
-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
-                                   uint flags,
-                                   UUID objectID, UUID ownerID, string text, byte[] color, uint parentID,
-                                   byte[] particleSystem,
-                                   byte clickAction, byte material, byte[] textureanim, bool attachment,
-                                   uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags,
-                                   double SoundRadius);
-
-
-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
-                                   uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
-                                   uint parentID, byte[] particleSystem, byte clickAction, byte material);
+        void SendPrimitiveToClient(SendPrimitiveData data);
 
+        void SendPrimTerseUpdate(SendPrimitiveTerseData data);
 
-        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-                                 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state,
-                                 UUID AssetId, UUID owner, int attachPoint);
+        void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler);
 
         void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
                                         List<InventoryFolderBase> folders, bool fetchFolders,
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 62ab5c7..9504e03 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
 
         public override int GetHashCode()
         {
-            return X.GetHashCode() * 29 + Y.GetHashCode();
+            return X.GetHashCode() ^ Y.GetHashCode();
         }
 
         public object Clone()
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index b5f947e..7da4893 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -26,17 +26,36 @@
  */
 
 using OpenSim.Framework.Servers.HttpServer;
+using System.Collections.Generic;
 
 namespace OpenSim.Framework
 {
     public class MainServer
     {
         private static BaseHttpServer instance;
+        private static Dictionary<uint, BaseHttpServer> m_Servers =
+                new Dictionary<uint, BaseHttpServer>();
 
         public static BaseHttpServer Instance
         {
             get { return instance; }
             set { instance = value; }
         }
+
+        public static IHttpServer GetHttpServer(uint port)
+        {
+            if (port == 0)
+                return Instance;
+            if (port == Instance.Port)
+                return Instance;
+
+            if (m_Servers.ContainsKey(port))
+                return m_Servers[port];
+
+            m_Servers[port] = new BaseHttpServer(port);
+            m_Servers[port].Start();
+
+            return m_Servers[port];
+        }
     }
 }
diff --git a/OpenSim/Framework/MinHeap.cs b/OpenSim/Framework/MinHeap.cs
new file mode 100755
index 0000000..ad39bbc
--- /dev/null
+++ b/OpenSim/Framework/MinHeap.cs
@@ -0,0 +1,375 @@
+using System;
+using System.Threading;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace OpenSim.Framework
+{
+    public interface IHandle { }
+
+    [Serializable, ComVisible(false)]
+    public class MinHeap<T> : ICollection<T>, ICollection
+    {
+        private class Handle : IHandle
+        {
+            internal int index = -1;
+            internal MinHeap<T> heap = null;
+
+            internal void Clear()
+            {
+                this.index = -1;
+                this.heap = null;
+            }
+        }
+
+        private struct HeapItem
+        {
+            internal T value;
+            internal Handle handle;
+
+            internal HeapItem(T value, Handle handle)
+            {
+                this.value = value;
+                this.handle = handle;
+            }
+
+            internal void Clear()
+            {
+                this.value = default(T);
+                if (this.handle != null)
+                {
+                    this.handle.Clear();
+                    this.handle = null;
+                }
+            }
+        }
+
+        public const int DEFAULT_CAPACITY = 4;
+
+        private HeapItem[] items;
+        private int size;
+        private object sync_root;
+        private int version;
+
+        private Comparison<T> comparison;
+
+        public MinHeap() : this(DEFAULT_CAPACITY, Comparer<T>.Default) { }
+        public MinHeap(int capacity) : this(capacity, Comparer<T>.Default) { }
+        public MinHeap(IComparer<T> comparer) : this(DEFAULT_CAPACITY, comparer) { }
+        public MinHeap(int capacity, IComparer<T> comparer) :
+            this(capacity, new Comparison<T>(comparer.Compare)) { }
+        public MinHeap(Comparison<T> comparison) : this(DEFAULT_CAPACITY, comparison) { }
+        public MinHeap(int capacity, Comparison<T> comparison)
+        {
+            this.items = new HeapItem[capacity];
+            this.comparison = comparison;
+            this.size = this.version = 0;
+        }
+
+        public int Count { get { return this.size; } }
+
+        public bool IsReadOnly { get { return false; } }
+
+        public bool IsSynchronized { get { return false; } }
+
+        public T this[IHandle key]
+        {
+            get
+            {
+                Handle handle = ValidateThisHandle(key);
+                return this.items[handle.index].value;
+            }
+
+            set
+            {
+                Handle handle = ValidateThisHandle(key);
+                this.items[handle.index].value = value;
+                if (!BubbleUp(handle.index))
+                    BubbleDown(handle.index);
+            }
+        }
+
+        public object SyncRoot
+        {
+            get
+            {
+                if (this.sync_root == null)
+                    Interlocked.CompareExchange<object>(ref this.sync_root, new object(), null);
+                return this.sync_root;
+            }
+        }
+
+        private Handle ValidateHandle(IHandle ihandle)
+        {
+            if (ihandle == null)
+                throw new ArgumentNullException("handle");
+            Handle handle = ihandle as Handle;
+            if (handle == null)
+                throw new InvalidOperationException("handle is not valid");
+            return handle;
+        }
+
+        private Handle ValidateThisHandle(IHandle ihandle)
+        {
+            Handle handle = ValidateHandle(ihandle);
+            if (!object.ReferenceEquals(handle.heap, this))
+                throw new InvalidOperationException("handle is not valid for this heap");
+            if (handle.index < 0)
+                throw new InvalidOperationException("handle is not associated to a value");
+            return handle;
+        }
+
+        private void Set(HeapItem item, int index)
+        {
+            this.items[index] = item;
+            if (item.handle != null)
+                item.handle.index = index;
+        }
+
+        private bool BubbleUp(int index)
+        {
+            HeapItem item = this.items[index];
+            int current, parent;
+
+            for (current = index, parent = (current - 1) / 2;
+                (current > 0) && (this.comparison(this.items[parent].value, item.value)) > 0;
+                current = parent, parent = (current - 1) / 2)
+            {
+                Set(this.items[parent], current);
+            }
+
+            if (current != index)
+            {
+                Set(item, current);
+                ++this.version;
+                return true;
+            }
+            return false;
+        }
+
+        private void BubbleDown(int index)
+        {
+            HeapItem item = this.items[index];
+            int current, child;
+
+            for (current = index, child = (2 * current) + 1;
+                current < this.size / 2;
+                current = child, child = (2 * current) + 1)
+            {
+                if ((child < this.size - 1) && this.comparison(this.items[child].value, this.items[child + 1].value) > 0)
+                    ++child;
+                if (this.comparison(this.items[child].value, item.value) >= 0)
+                    break;
+                Set(this.items[child], current);
+            }
+
+            if (current != index)
+            {
+                Set(item, current);
+                ++this.version;
+            }
+        }
+
+        public bool TryGetValue(IHandle key, out T value)
+        {
+            Handle handle = ValidateHandle(key);
+            if (handle.index > -1)
+            {
+                value = this.items[handle.index].value;
+                return true;
+            }
+            value = default(T);
+            return false;
+        }
+
+        public bool ContainsHandle(IHandle ihandle)
+        {
+            Handle handle = ValidateHandle(ihandle);
+            return object.ReferenceEquals(handle.heap, this) && handle.index > -1;
+        }
+
+        public void Add(T value, ref IHandle handle)
+        {
+            if (handle == null)
+                handle = new Handle();
+            Add(value, handle);
+        }
+
+        public void Add(T value, IHandle ihandle)
+        {
+            if (this.size == this.items.Length)
+            {
+                int capacity = (int)((this.items.Length * 200L) / 100L);
+                if (capacity < (this.items.Length + DEFAULT_CAPACITY))
+                    capacity = this.items.Length + DEFAULT_CAPACITY;
+                Array.Resize<HeapItem>(ref this.items, capacity);
+            }
+
+            Handle handle = null;
+            if (ihandle != null)
+            {
+                handle = ValidateHandle(ihandle);
+                handle.heap = this;
+            }
+
+            HeapItem item = new MinHeap<T>.HeapItem(value, handle);
+
+            Set(item, this.size);
+            BubbleUp(this.size++);
+        }
+
+        public void Add(T value)
+        {
+            Add(value, null);
+        }
+
+        public T Min()
+        {
+            if (this.size == 0)
+                throw new InvalidOperationException("Heap is empty");
+
+            return this.items[0].value;
+        }
+
+        public void Clear()
+        {
+            for (int index = 0; index < this.size; ++index)
+                this.items[index].Clear();
+            this.size = 0;
+            ++this.version;
+        }
+
+        public void TrimExcess()
+        {
+            int length = (int)(this.items.Length * 0.9);
+            if (this.size < length)
+                Array.Resize<HeapItem>(ref this.items, Math.Min(this.size, DEFAULT_CAPACITY));
+        }
+
+        private void RemoveAt(int index)
+        {
+            if (this.size == 0)
+                throw new InvalidOperationException("Heap is empty");
+            if (index >= this.size)
+                throw new ArgumentOutOfRangeException("index");
+
+            this.items[index].Clear();
+            if (--this.size > 0 && index != this.size)
+            {
+                Set(this.items[this.size], index);
+                if (!BubbleUp(index))
+                    BubbleDown(index);
+            }
+        }
+
+        public T RemoveMin()
+        {
+            if (this.size == 0)
+                throw new InvalidOperationException("Heap is empty");
+
+            HeapItem item = this.items[0];
+            RemoveAt(0);
+            return item.value;
+        }
+
+        public T Remove(IHandle ihandle)
+        {
+            Handle handle = ValidateThisHandle(ihandle);
+            HeapItem item = this.items[handle.index];
+            RemoveAt(handle.index);
+            return item.value;
+        }
+
+        private int GetIndex(T value)
+        {
+            EqualityComparer<T> comparer = EqualityComparer<T>.Default;
+            int index;
+
+            for (index = 0; index < this.size; ++index)
+            {
+                if (comparer.Equals(this.items[index].value, value))
+                    return index;
+            }
+            return -1;
+        }
+
+        public bool Contains(T value)
+        {
+            return GetIndex(value) != -1;
+        }
+
+        public bool Remove(T value)
+        {
+            int index = GetIndex(value);
+            if (index != -1)
+            {
+                RemoveAt(index);
+                return true;
+            }
+            return false;
+        }
+
+        public void CopyTo(T[] array, int index)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Multidimensional array not supported");
+            if (array.GetLowerBound(0) != 0)
+                throw new ArgumentException("Non-zero lower bound array not supported");
+
+            int length = array.Length;
+            if ((index < 0) || (index > length))
+                throw new ArgumentOutOfRangeException("index");
+            if ((length - index) < this.size)
+                throw new ArgumentException("Not enough space available in array starting at index");
+
+            for (int i = 0; i < this.size; ++i)
+                array[index + i] = this.items[i].value;
+        }
+
+        public void CopyTo(Array array, int index)
+        {
+            if (array == null)
+                throw new ArgumentNullException("array");
+            if (array.Rank != 1)
+                throw new ArgumentException("Multidimensional array not supported");
+            if (array.GetLowerBound(0) != 0)
+                throw new ArgumentException("Non-zero lower bound array not supported");
+
+            int length = array.Length;
+            if ((index < 0) || (index > length))
+                throw new ArgumentOutOfRangeException("index");
+            if ((length - index) < this.size)
+                throw new ArgumentException("Not enough space available in array starting at index");
+
+            try
+            {
+                for (int i = 0; i < this.size; ++i)
+                    array.SetValue(this.items[i].value, index + i);
+            }
+            catch (ArrayTypeMismatchException)
+            {
+                throw new ArgumentException("Invalid array type");
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            int version = this.version;
+
+            for (int index = 0; index < this.size; ++index)
+            {
+                if (version != this.version)
+                    throw new InvalidOperationException("Heap was modified while enumerating");
+                yield return this.items[index].value;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/OpenSim/Framework/Parallel.cs b/OpenSim/Framework/Parallel.cs
index 6efdad0..70eecdc 100644
--- a/OpenSim/Framework/Parallel.cs
+++ b/OpenSim/Framework/Parallel.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework
     /// </summary>
     public static class Parallel
     {
-        private static readonly int processorCount = System.Environment.ProcessorCount;
+        public static readonly int ProcessorCount = System.Environment.ProcessorCount;
 
         /// <summary>
         /// Executes a for loop in which iterations may run in parallel
@@ -46,7 +46,7 @@ namespace OpenSim.Framework
         /// <param name="body">Method body to run for each iteration of the loop</param>
         public static void For(int fromInclusive, int toExclusive, Action<int> body)
         {
-            For(processorCount, fromInclusive, toExclusive, body);
+            For(ProcessorCount, fromInclusive, toExclusive, body);
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ namespace OpenSim.Framework
 
             for (int i = 0; i < threadCount; i++)
             {
-                ThreadPool.QueueUserWorkItem(
+                Util.FireAndForget(
                     delegate(object o)
                     {
                         int threadIndex = (int)o;
@@ -103,7 +103,7 @@ namespace OpenSim.Framework
         /// <param name="body">Method body to run for each object in the collection</param>
         public static void ForEach<T>(IEnumerable<T> enumerable, Action<T> body)
         {
-            ForEach<T>(processorCount, enumerable, body);
+            ForEach<T>(ProcessorCount, enumerable, body);
         }
 
         /// <summary>
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
 
             for (int i = 0; i < threadCount; i++)
             {
-                ThreadPool.QueueUserWorkItem(
+                Util.FireAndForget(
                     delegate(object o)
                     {
                         int threadIndex = (int)o;
@@ -161,7 +161,7 @@ namespace OpenSim.Framework
         /// <param name="actions">A series of method bodies to execute</param>
         public static void Invoke(params Action[] actions)
         {
-            Invoke(processorCount, actions);
+            Invoke(ProcessorCount, actions);
         }
 
         /// <summary>
@@ -178,7 +178,7 @@ namespace OpenSim.Framework
 
             for (int i = 0; i < threadCount; i++)
             {
-                ThreadPool.QueueUserWorkItem(
+                Util.FireAndForget(
                     delegate(object o)
                     {
                         int threadIndex = (int)o;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a7315f5..721233d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -821,7 +821,7 @@ namespace OpenSim.Framework
                                                 "Scope ID for this region", ScopeID.ToString(), true);
 
             configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Region Type", String.Empty, true);
+                                                "Free form string describing the type of region", String.Empty, true);
         }
 
         public void loadConfigurationOptions()
@@ -978,11 +978,12 @@ namespace OpenSim.Framework
 
         public void SaveLastMapUUID(UUID mapUUID)
         {
-            if (null == configMember) return;
-
             lastMapUUID = mapUUID;
             lastMapRefresh = Util.UnixTimeSinceEpoch().ToString();
 
+            if (configMember == null)
+                return;
+
             configMember.forceSetConfigurationOption("lastmap_uuid", mapUUID.ToString());
             configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh);
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 942fed9..85d7be2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1609,7 +1609,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //while (true)
                 //{
                 //    context = m_httpListener.GetContext();
-                //    ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
+                //    ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(HandleRequest), context);
                // }
             }
             catch (Exception e)
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs
index e21ff32..d56231a 100644
--- a/OpenSim/Framework/ThrottleOutPacketType.cs
+++ b/OpenSim/Framework/ThrottleOutPacketType.cs
@@ -51,4 +51,16 @@ namespace OpenSim.Framework
         /// <remarks>This is a sub-category of Task</remarks>
         State = 7,
     }
+
+    [Flags]
+    public enum ThrottleOutPacketTypeFlags
+    {
+        Land = 1 << 0,
+        Wind = 1 << 1,
+        Cloud = 1 << 2,
+        Task = 1 << 3,
+        Texture = 1 << 4,
+        Asset = 1 << 5,
+        State = 1 << 6,
+    }
 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 38729c6..d09bd6d 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -41,19 +41,36 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
+using BclExtras;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
+using Amib.Threading;
 
 namespace OpenSim.Framework
 {
     /// <summary>
+    /// The method used by Util.FireAndForget for asynchronously firing events
+    /// </summary>
+    public enum FireAndForgetMethod
+    {
+        UnsafeQueueUserWorkItem,
+        QueueUserWorkItem,
+        BeginInvoke,
+        SmartThreadPool,
+        Thread,
+    }
+
+    /// <summary>
     /// Miscellaneous utility functions
     /// </summary>
     public class Util
     {
+        private static SmartThreadPool m_ThreadPool = null;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static uint nextXferID = 5000;
@@ -69,7 +86,9 @@ namespace OpenSim.Framework
 
         public static readonly Regex UUIDPattern 
             = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
-        
+
+        public static FireAndForgetMethod FireAndForgetMethod = FireAndForgetMethod.SmartThreadPool;
+
         /// <summary>
         /// Linear interpolates B<->C using percent A
         /// </summary>
@@ -1269,24 +1288,78 @@ namespace OpenSim.Framework
 
         #region FireAndForget Threading Pattern
 
-        public static void FireAndForget(System.Threading.WaitCallback callback)
+        /// <summary>
+        /// Created to work around a limitation in Mono with nested delegates
+        /// </summary>
+        private class FireAndForgetWrapper
         {
-            callback.BeginInvoke(null, EndFireAndForget, callback);
+            public void FireAndForget(System.Threading.WaitCallback callback)
+            {
+                callback.BeginInvoke(null, EndFireAndForget, callback);
+            }
+
+            public void FireAndForget(System.Threading.WaitCallback callback, object obj)
+            {
+                callback.BeginInvoke(obj, EndFireAndForget, callback);
+            }
+
+            private static void EndFireAndForget(IAsyncResult ar)
+            {
+                System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
+
+                try { callback.EndInvoke(ar); }
+                catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
+
+                ar.AsyncWaitHandle.Close();
+            }
         }
 
-        public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
+        public static void FireAndForget(System.Threading.WaitCallback callback)
         {
-            callback.BeginInvoke(obj, EndFireAndForget, callback);
+            FireAndForget(callback, null);
         }
 
-        private static void EndFireAndForget(IAsyncResult ar)
+        public static void SetMaxThreads(int maxThreads)
         {
-            System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
+            if (m_ThreadPool != null)
+                return;
+
+            STPStartInfo startInfo = new STPStartInfo();
+            startInfo.IdleTimeout = 2000; // 2 seconds
+            startInfo.MaxWorkerThreads = maxThreads;
+            startInfo.MinWorkerThreads = 2;
+            startInfo.StackSize = 524288;
+            startInfo.ThreadPriority = ThreadPriority.Normal;
 
-            try { callback.EndInvoke(ar); }
-            catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
+            startInfo.StartSuspended = false;
+
+            m_ThreadPool = new SmartThreadPool(startInfo);
+        }
 
-            ar.AsyncWaitHandle.Close();
+        public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
+        {
+            switch (FireAndForgetMethod)
+            {
+                case FireAndForgetMethod.UnsafeQueueUserWorkItem:
+                    System.Threading.ThreadPool.UnsafeQueueUserWorkItem(callback, obj);
+                    break;
+                case FireAndForgetMethod.QueueUserWorkItem:
+                    System.Threading.ThreadPool.QueueUserWorkItem(callback, obj);
+                    break;
+                case FireAndForgetMethod.BeginInvoke:
+                    FireAndForgetWrapper wrapper = Singleton.GetInstance<FireAndForgetWrapper>();
+                    wrapper.FireAndForget(callback, obj);
+                    break;
+                case FireAndForgetMethod.SmartThreadPool:
+                    m_ThreadPool.QueueWorkItem(delegate(object o) { callback(o); return null; }, obj);
+                    break;
+                case FireAndForgetMethod.Thread:
+                    System.Threading.Thread thread = new System.Threading.Thread(delegate(object o) { callback(o); });
+                    thread.Start(obj);
+                    break;
+                default:
+                    throw new NotImplementedException();
+            }
         }
 
         #endregion FireAndForget Threading Pattern
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index df5eaab..8ad1e9c 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -148,8 +148,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
                 friendlistupdater.presence2 = receiver;
                 friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;
                 friendlistupdater.OnDone += PresenceUpdateDone;
-                WaitCallback cb = new WaitCallback(friendlistupdater.go);
-                ThreadPool.QueueUserWorkItem(cb);
+                Util.FireAndForget(friendlistupdater.go);
             }
             else
             {
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index ca6a2a3..c04b8c2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -67,6 +67,8 @@ namespace OpenSim
 
             IConfig startupConfig = m_config.Source.Configs["Startup"];
 
+            Util.SetMaxThreads(startupConfig.GetInt("MaxPoolThreads", 15));
+
             if (startupConfig != null)
             {
                 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
@@ -90,10 +92,17 @@ namespace OpenSim
                             appender.File = fileName;
                             appender.ActivateOptions();
                         }
-                        m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File);
+                        m_log.InfoFormat("[LOGGING]: Logging started to file {0}", appender.File);
                     }
                 }
+
+                string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty);
+                FireAndForgetMethod asyncCallMethod;
+                if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
+                    Util.FireAndForgetMethod = asyncCallMethod;
             }
+
+            m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
         }
 
         /// <summary>
@@ -628,8 +637,20 @@ namespace OpenSim
                         break;
 
                     case "save":
-                        m_log.Info("Saving configuration file: " + Application.iniFilePath);
-                        m_config.Save(Application.iniFilePath);
+                        if (cmdparams.Length < 2)
+                        {
+                            m_log.Error("SYNTAX: " + n + " SAVE FILE");
+                            return;
+                        }
+
+                        if (Application.iniFilePath == cmdparams[1])
+                        {
+                            m_log.Error("FILE can not be "+Application.iniFilePath);
+                            return;
+                        }
+
+                        m_log.Info("Saving configuration file: " + cmdparams[1]);
+                        m_config.Save(cmdparams[1]);
                         break;
                 }
             }
diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
deleted file mode 100644
index 231b3aa..0000000
--- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.
- */
-
-namespace OpenSim.Region.ClientStack
-{
-    /// <summary>
-    /// Allow users to tweak parameters for the client stack.
-    /// 
-    /// At the moment this is very incomplete - other tweakable settings could be added.  This is also somewhat LL client
-    /// oriented right now.
-    /// </summary>
-    public class ClientStackUserSettings
-    {
-        /// <summary>
-        /// The settings for the throttle that governs how many packets in total are sent to the client.
-        /// </summary>
-        public ThrottleSettings TotalThrottleSettings;
-        
-        /// <summary>
-        /// A multiplier applied to all client throttle settings.  Default value is x2 (temporarily)
-        /// </summary>
-        public float ClientThrottleMultipler = 2;
-    }
-}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 05a2a63..0ba76ec 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -45,12 +45,50 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
 using OpenSim.Services.Interfaces;
-using Timer=System.Timers.Timer;
+using Timer = System.Timers.Timer;
 using AssetLandmark = OpenSim.Framework.AssetLandmark;
 using Nini.Config;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
+    #region Enums
+
+    /// <summary>
+    /// Specifies the fields that have been changed when sending a prim or
+    /// avatar update
+    /// </summary>
+    [Flags]
+    public enum PrimUpdateFlags : uint
+    {
+        None = 0,
+        AttachmentPoint = 1 << 0,
+        Material = 1 << 1,
+        ClickAction = 1 << 2,
+        Scale = 1 << 3,
+        ParentID = 1 << 4,
+        PrimFlags = 1 << 5,
+        PrimData = 1 << 6,
+        MediaURL = 1 << 7,
+        ScratchPad = 1 << 8,
+        Textures = 1 << 9,
+        TextureAnim = 1 << 10,
+        NameValue = 1 << 11,
+        Position = 1 << 12,
+        Rotation = 1 << 13,
+        Velocity = 1 << 14,
+        Acceleration = 1 << 15,
+        AngularVelocity = 1 << 16,
+        CollisionPlane = 1 << 17,
+        Text = 1 << 18,
+        Particles = 1 << 19,
+        ExtraData = 1 << 20,
+        Sound = 1 << 21,
+        Joint = 1 << 22,
+        FullUpdate = UInt32.MaxValue
+    }
+
+    #endregion Enums
+
     public delegate bool PacketMethod(IClientAPI simClient, Packet packet);
 
     /// <summary>
@@ -257,6 +295,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event MuteListRequest OnMuteListRequest;
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
         public event PlacesQuery OnPlacesQuery;
+        public event AgentFOV OnAgentFOV;
 
         #endregion Events
 
@@ -282,12 +321,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private readonly IGroupsModule m_GroupsModule;
 
         private int m_cachedTextureSerial;
-        private Timer m_avatarTerseUpdateTimer;
-        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-        private Timer m_primTerseUpdateTimer;
-        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-        private Timer m_primFullUpdateTimer;
-        private List<ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates = new List<ObjectUpdatePacket.ObjectDataBlock>();
+        private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates;
+        private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates;
+        private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates;
         private int m_moneyBalance;
         private int m_animationSequenceNumber = 1;
         private bool m_SendLogoutPacketWhenClosing = true;
@@ -296,26 +332,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>();
         protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
-        protected IScene m_scene;
+        protected Scene m_scene;
         protected LLImageManager m_imageManager;
         protected string m_firstName;
         protected string m_lastName;
         protected Thread m_clientThread;
         protected Vector3 m_startpos;
         protected EndPoint m_userEndPoint;
-        protected UUID m_activeGroupID = UUID.Zero;
+        protected UUID m_activeGroupID;
         protected string m_activeGroupName = String.Empty;
         protected ulong m_activeGroupPowers;
-        protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>();
+        protected Dictionary<UUID, ulong> m_groupPowers = new Dictionary<UUID, ulong>();
         protected int m_terrainCheckerCount;
-
-        // LL uses these limits, apparently. Compressed terse would be 23, but we don't have that yet
-        protected int m_primTerseUpdatesPerPacket = 10;
-        protected int m_primFullUpdatesPerPacket = 14;
-        protected int m_primTerseUpdateRate = 10;
-        protected int m_primFullUpdateRate = 14;
-        protected int m_avatarTerseUpdateRate = 50;
-        protected int m_avatarTerseUpdatesPerPacket = 5;
+        protected uint m_agentFOVCounter;
+
+        // These numbers are guesses at a decent tradeoff between responsiveness
+        // of the interest list and throughput. Lower is more responsive, higher
+        // is better throughput
+        protected int m_primTerseUpdatesPerPacket = 25;
+        protected int m_primFullUpdatesPerPacket = 100;
+        protected int m_avatarTerseUpdatesPerPacket = 10;
         /// <summary>Number of texture packets to put on the queue each time the
         /// OnQueueEmpty event is triggered for the texture category</summary>
         protected int m_textureSendLimit = 20;
@@ -369,21 +405,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Constructor
         /// </summary>
-        public LLClientView(EndPoint remoteEP, IScene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo,
+        public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo,
             UUID agentId, UUID sessionId, uint circuitCode)
         {
             RegisterInterface<IClientIM>(this);
             RegisterInterface<IClientChat>(this);
             RegisterInterface<IClientIPEndpoint>(this);
-            
+
             InitDefaultAnimations();
 
             m_scene = scene;
+
+            m_avatarTerseUpdates = new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
+            m_primTerseUpdates = new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
+            m_primFullUpdates = new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(m_scene.Entities.Count);
+
             m_assetService = m_scene.RequestModuleInterface<IAssetService>();
             m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>();
             m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>();
             m_imageManager = new LLImageManager(this, m_assetService, Scene.RequestModuleInterface<IJ2KDecoder>());
-            m_channelVersion = Utils.StringToBytes(scene.GetSimulatorVersion());
+            m_channelVersion = Util.StringToBytes256(scene.GetSimulatorVersion());
             m_agentId = agentId;
             m_sessionId = sessionId;
             m_secureSessionId = sessionInfo.LoginInfo.SecureSession;
@@ -438,25 +479,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Remove ourselves from the scene
             m_scene.RemoveClient(AgentId);
 
-            // Shut down timers. Thread Context of this method is murky.   Lock all timers
-            if (m_avatarTerseUpdateTimer.Enabled)
-                lock (m_avatarTerseUpdateTimer)
-                    m_avatarTerseUpdateTimer.Stop();
-            if (m_primTerseUpdateTimer.Enabled)
-                lock (m_primTerseUpdateTimer)
-                    m_primTerseUpdateTimer.Stop();
-            if (m_primFullUpdateTimer.Enabled)
-                lock (m_primFullUpdateTimer)
-                    m_primFullUpdateTimer.Stop();
-
             // We can't reach into other scenes and close the connection
             // We need to do this over grid communications
             //m_scene.CloseAllAgents(CircuitCode);
 
-            m_avatarTerseUpdateTimer.Dispose();
-            m_primTerseUpdateTimer.Dispose();
-            m_primFullUpdateTimer.Dispose();
-
             // Disable UDP handling for this client
             m_udpClient.Shutdown();
 
@@ -474,7 +500,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 kupack.UserInfo.SessionID = SessionId;
                 kupack.TargetBlock.TargetIP = 0;
                 kupack.TargetBlock.TargetPort = 0;
-                kupack.UserInfo.Reason = Utils.StringToBytes(message);
+                kupack.UserInfo.Reason = Util.StringToBytes256(message);
                 OutPacket(kupack, ThrottleOutPacketType.Task);
                 // You must sleep here or users get no message!
                 Thread.Sleep(500);
@@ -483,18 +509,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void Stop()
         {
-            // Shut down timers.  Thread Context is Murky, lock all timers!
-            if (m_avatarTerseUpdateTimer.Enabled)
-                lock (m_avatarTerseUpdateTimer)
-                    m_avatarTerseUpdateTimer.Stop();
-
-            if (m_primTerseUpdateTimer.Enabled)
-                lock (m_primTerseUpdateTimer)
-                    m_primTerseUpdateTimer.Stop();
 
-            if (m_primFullUpdateTimer.Enabled)
-                lock (m_primFullUpdateTimer)
-                    m_primFullUpdateTimer.Stop();
         }
 
         #endregion Client Methods
@@ -590,18 +605,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public virtual void Start()
         {
-            m_avatarTerseUpdateTimer = new Timer(m_avatarTerseUpdateRate);
-            m_avatarTerseUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessAvatarTerseUpdates);
-            m_avatarTerseUpdateTimer.AutoReset = false;
-
-            m_primTerseUpdateTimer = new Timer(m_primTerseUpdateRate);
-            m_primTerseUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimTerseUpdates);
-            m_primTerseUpdateTimer.AutoReset = false;
-
-            m_primFullUpdateTimer = new Timer(m_primFullUpdateRate);
-            m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates);
-            m_primFullUpdateTimer.AutoReset = false;
-
             m_scene.AddNewClient(this);
 
             RefreshGroupMembership();
@@ -618,7 +621,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         // Sound
-        public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid,UUID ParentId,float Gain, Vector3 Position,UInt64 Handle)
+        public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid, UUID ParentId, float Gain, Vector3 Position, UInt64 Handle)
         {
         }
 
@@ -642,7 +645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo.WaterHeight = args.waterHeight;
 
             handshake.RegionInfo.RegionFlags = args.regionFlags;
-            handshake.RegionInfo.SimName = Utils.StringToBytes(args.regionName);
+            handshake.RegionInfo.SimName = Util.StringToBytes256(args.regionName);
             handshake.RegionInfo.SimOwner = args.SimOwner;
             handshake.RegionInfo.TerrainBase0 = args.terrainBase0;
             handshake.RegionInfo.TerrainBase1 = args.terrainBase1;
@@ -655,7 +658,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo.CacheID = UUID.Random(); //I guess this is for the client to remember an old setting?
             handshake.RegionInfo2 = new RegionHandshakePacket.RegionInfo2Block();
             handshake.RegionInfo2.RegionID = regionInfo.RegionID;
-            
+
             handshake.RegionInfo3 = new RegionHandshakePacket.RegionInfo3Block();
             handshake.RegionInfo3.CPUClassID = 9;
             handshake.RegionInfo3.CPURatio = 1;
@@ -698,11 +701,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator);
             reply.ChatData.Audible = audible;
-            reply.ChatData.Message = Utils.StringToBytes(message);
+            reply.ChatData.Message = Util.StringToBytes1024(message);
             reply.ChatData.ChatType = type;
             reply.ChatData.SourceType = source;
             reply.ChatData.Position = fromPos;
-            reply.ChatData.FromName = Utils.StringToBytes(fromName);
+            reply.ChatData.FromName = Util.StringToBytes256(fromName);
             reply.ChatData.OwnerID = fromAgentID;
             reply.ChatData.SourceID = fromAgentID;
 
@@ -723,7 +726,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 msg.AgentData.AgentID = new UUID(im.fromAgentID);
                 msg.AgentData.SessionID = UUID.Zero;
-                msg.MessageBlock.FromAgentName = Utils.StringToBytes(im.fromAgentName);
+                msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName);
                 msg.MessageBlock.Dialog = im.dialog;
                 msg.MessageBlock.FromGroup = im.fromGroup;
                 if (im.imSessionID == UUID.Zero.Guid)
@@ -736,12 +739,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 msg.MessageBlock.RegionID = new UUID(im.RegionID);
                 msg.MessageBlock.Timestamp = im.timestamp;
                 msg.MessageBlock.ToAgentID = new UUID(im.toAgentID);
-                // Cap the message length at 1099. There is a limit in ImprovedInstantMessagePacket
-                // the limit is 1100 but a 0 byte gets added to mark the end of the string
-                if (im.message != null && im.message.Length > 1099)
-                    msg.MessageBlock.Message = Utils.StringToBytes(im.message.Substring(0, 1099));
-                else
-                    msg.MessageBlock.Message = Utils.StringToBytes(im.message);
+                msg.MessageBlock.Message = Util.StringToBytes1024(im.message);
                 msg.MessageBlock.BinaryBucket = im.binaryBucket;
 
                 if (im.message.StartsWith("[grouptest]"))
@@ -759,7 +757,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         eq.ChatterboxInvitation(
                             new UUID("00000000-68f9-1111-024e-222222111123"),
                             "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0,
-                            false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Utils.StringToBytes("OpenSimulator Testing"));
+                            false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing"));
 
                         eq.ChatterBoxSessionAgentListUpdates(
                             new UUID("00000000-68f9-1111-024e-222222111123"),
@@ -776,13 +774,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SendGenericMessage(string method, List<string> message)
         {
             GenericMessagePacket gmp = new GenericMessagePacket();
-            gmp.MethodData.Method = Utils.StringToBytes(method);
+            gmp.MethodData.Method = Util.StringToBytes256(method);
             gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
             int i = 0;
             foreach (string val in message)
             {
                 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock();
-                gmp.ParamList[i++].Parameter = Utils.StringToBytes(val);
+                gmp.ParamList[i++].Parameter = Util.StringToBytes256(val);
             }
             OutPacket(gmp, ThrottleOutPacketType.Task);
         }
@@ -793,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="map">heightmap</param>
         public virtual void SendLayerData(float[] map)
         {
-            ThreadPool.QueueUserWorkItem(DoSendLayerData, map);
+            Util.FireAndForget(DoSendLayerData, map);
         }
 
         /// <summary>
@@ -802,32 +800,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="o"></param>
         private void DoSendLayerData(object o)
         {
-            float[] map = (float[])o;
+            float[] map = LLHeightFieldMoronize((float[])o);
 
             try
             {
-                for (int y = 0; y < 16; y++)
-                {
-                    // For some terrains, sending more than one terrain patch at once results in a libsecondlife exception
-                    // see http://opensimulator.org/mantis/view.php?id=1662
-                    //for (int x = 0; x < 16; x += 4)
-                    //{
-                    //    SendLayerPacket(map, y, x);
-                    //    Thread.Sleep(150);
-                    //}
-                    for (int x = 0; x < 16; x++)
-                    {
-                        SendLayerData(x, y, LLHeightFieldMoronize(map));
-                        Thread.Sleep(35);
-                    }
-                }
+                //for (int y = 0; y < 16; y++)
+                //{
+                //    for (int x = 0; x < 16; x++)
+                //    {
+                //        SendLayerData(x, y, map);
+                //    }
+                //}
+
+                // Send LayerData in a spiral pattern. Fun!
+                SendLayerTopRight(map, 0, 0, 15, 15);
             }
             catch (Exception e)
             {
-                m_log.Warn("[CLIENT]: ClientView.API.cs: SendLayerData() - Failed with exception " + e);
+                m_log.Error("[CLIENT]: SendLayerData() Failed with exception: " + e.Message, e);
             }
         }
 
+        private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
+        {
+            // Row
+            for (int i = x1; i <= x2; i++)
+                SendLayerData(i, y1, map);
+
+            // Column    
+            for (int j = y1 + 1; j <= y2; j++)
+                SendLayerData(x2, j, map);
+     
+            if (x2 - x1 > 0)
+                SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
+        }
+
+        void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
+        {
+            // Row in reverse
+            for (int i = x2; i >= x1; i--)
+                SendLayerData(i, y2, map);
+
+            // Column in reverse
+            for (int j = y2 - 1; j >= y1; j--)
+                SendLayerData(x1, j, map);
+
+            if (x2 - x1 > 0)
+                SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
+        }
+
         /// <summary>
         /// Sends a set of four patches (x, x+1, ..., x+3) to the client
         /// </summary>
@@ -856,22 +877,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             try
             {
-                int[] patches = new int[1];
-                int patchx, patchy;
-                patchx = px;
-                patchy = py;
+                int[] patches = new int[] { py * 16 + px };
+                float[] heightmap = (map.Length == 65536) ?
+                    map :
+                    LLHeightFieldMoronize(map);
 
-                patches[0] = patchx + 0 + patchy * 16;
-
-                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(((map.Length==65536)? map : LLHeightFieldMoronize(map)), patches);
-                layerpack.Header.Zerocoded = true;
+                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
+                layerpack.Header.Reliable = true;
 
                 OutPacket(layerpack, ThrottleOutPacketType.Land);
-
             }
             catch (Exception e)
             {
-                m_log.Warn("[client]: ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
+                m_log.Error("[CLIENT]: SendLayerData() Failed with exception: " + e.Message, e);
             }
         }
 
@@ -900,7 +918,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         Array.Copy(map, i * (int)Constants.RegionSize, returnmap, i * 256, 256);
                 }
 
-                
                 //Array.Copy(map,0,returnmap,0,(map.Length < 65536)? map.Length : 65536);
 
                 return returnmap;
@@ -914,7 +931,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="windSpeeds">16x16 array of wind speeds</param>
         public virtual void SendWindData(Vector2[] windSpeeds)
         {
-            ThreadPool.QueueUserWorkItem(new WaitCallback(DoSendWindData), (object)windSpeeds);
+            Util.FireAndForget(DoSendWindData, windSpeeds);
         }
 
         /// <summary>
@@ -923,7 +940,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="windSpeeds">16x16 array of cloud densities</param>
         public virtual void SendCloudData(float[] cloudDensity)
         {
-            ThreadPool.QueueUserWorkItem(new WaitCallback(DoSendCloudData), (object)cloudDensity);
+            Util.FireAndForget(DoSendCloudData, cloudDensity);
         }
 
         /// <summary>
@@ -1012,14 +1029,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             agentData.child = false;
             agentData.firstname = m_firstName;
             agentData.lastname = m_lastName;
-            
+
             ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>();
-            
+
             if (capsModule == null) // can happen when shutting down.
                 return agentData;
 
             agentData.CapsPath = capsModule.GetCapsPath(m_agentId);
-            agentData.ChildrenCapSeeds = new Dictionary<ulong,string>(capsModule.GetChildrenSeeds(m_agentId));
+            agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId));
 
             return agentData;
         }
@@ -1046,7 +1063,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
             newSimPack.RegionData.SimIP += (uint)byteIP[0];
             newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port;
-            newSimPack.RegionData.SeedCapability = Utils.StringToBytes(capsURL);
+            newSimPack.RegionData.SeedCapability = Util.StringToBytes256(capsURL);
 
             // Hack to get this out immediately and skip throttles
             OutPacket(newSimPack, ThrottleOutPacketType.Unknown);
@@ -1124,7 +1141,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             teleport.Info.RegionHandle = regionHandle;
             teleport.Info.SimAccess = simAccess;
 
-            teleport.Info.SeedCapability = Utils.StringToBytes(capsURL);
+            teleport.Info.SeedCapability = Util.StringToBytes256(capsURL);
 
             IPAddress oIP = newRegionEndPoint.Address;
             byte[] byteIP = oIP.GetAddressBytes();
@@ -1149,7 +1166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             TeleportFailedPacket tpFailed = (TeleportFailedPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFailed);
             tpFailed.Info.AgentID = AgentId;
-            tpFailed.Info.Reason = Utils.StringToBytes(reason);
+            tpFailed.Info.Reason = Util.StringToBytes256(reason);
             tpFailed.AlertInfo = new TeleportFailedPacket.AlertInfoBlock[0];
 
             // Hack to get this out immediately and skip throttles
@@ -1211,11 +1228,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             StartPingCheckPacket pc = (StartPingCheckPacket)PacketPool.Instance.GetPacket(PacketType.StartPingCheck);
             pc.Header.Reliable = false;
 
-            OutgoingPacket oldestPacket = m_udpClient.NeedAcks.GetOldest();
-
             pc.PingID.PingID = seq;
-            pc.PingID.OldestUnacked = (oldestPacket != null) ? oldestPacket.SequenceNumber : 0;
-            
+            // We *could* get OldestUnacked, but it would hurt performance and not provide any benefit
+            pc.PingID.OldestUnacked = 0;
+
             OutPacket(pc, ThrottleOutPacketType.Unknown);
         }
 
@@ -1521,7 +1537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             inventoryReply.Header.Zerocoded = true;
             OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
         }
-        
+
         protected void SendBulkUpdateInventoryFolder(InventoryFolderBase folderBase)
         {
             // We will use the same transaction id for all the separate packets to be sent out in this update.
@@ -1545,7 +1561,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bulkUpdate.FolderData = folderDataBlocks.ToArray();
                 List<BulkUpdateInventoryPacket.ItemDataBlock> foo = new List<BulkUpdateInventoryPacket.ItemDataBlock>();
                 bulkUpdate.ItemData = foo.ToArray();
- 
+
                 //m_log.Debug("SendBulkUpdateInventory :" + bulkUpdate);
                 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
             }
@@ -1668,7 +1684,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             return itemBlock;
         }
-        
+
         public void SendBulkUpdateInventory(InventoryNodeBase node)
         {
             if (node is InventoryItemBase)
@@ -1678,7 +1694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             else
                 m_log.ErrorFormat("[CLIENT]: Client for {0} sent unknown inventory node named {1}", Name, node.Name);
         }
-                
+
         protected void SendBulkUpdateInventoryItem(InventoryItemBase item)
         {
             const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
@@ -1881,11 +1897,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AgentDataUpdatePacket sendAgentDataUpdate = (AgentDataUpdatePacket)PacketPool.Instance.GetPacket(PacketType.AgentDataUpdate);
             sendAgentDataUpdate.AgentData.ActiveGroupID = activegroupid;
             sendAgentDataUpdate.AgentData.AgentID = agentid;
-            sendAgentDataUpdate.AgentData.FirstName = Utils.StringToBytes(firstname);
-            sendAgentDataUpdate.AgentData.GroupName = Utils.StringToBytes(groupname);
+            sendAgentDataUpdate.AgentData.FirstName = Util.StringToBytes256(firstname);
+            sendAgentDataUpdate.AgentData.GroupName = Util.StringToBytes256(groupname);
             sendAgentDataUpdate.AgentData.GroupPowers = grouppowers;
-            sendAgentDataUpdate.AgentData.GroupTitle = Utils.StringToBytes(grouptitle);
-            sendAgentDataUpdate.AgentData.LastName = Utils.StringToBytes(lastname);
+            sendAgentDataUpdate.AgentData.GroupTitle = Util.StringToBytes256(grouptitle);
+            sendAgentDataUpdate.AgentData.LastName = Util.StringToBytes256(lastname);
             OutPacket(sendAgentDataUpdate, ThrottleOutPacketType.Task);
         }
 
@@ -1898,7 +1914,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage);
             alertPack.AlertData = new AlertMessagePacket.AlertDataBlock();
-            alertPack.AlertData.Message = Utils.StringToBytes(message);
+            alertPack.AlertData.Message = Util.StringToBytes256(message);
             alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0];
             OutPacket(alertPack, ThrottleOutPacketType.Task);
         }
@@ -1925,7 +1941,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AgentAlertMessagePacket alertPack = (AgentAlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AgentAlertMessage);
             alertPack.AgentData.AgentID = AgentId;
-            alertPack.AlertData.Message = Utils.StringToBytes(message);
+            alertPack.AlertData.Message = Util.StringToBytes256(message);
             alertPack.AlertData.Modal = modal;
 
             return alertPack;
@@ -1935,12 +1951,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 string url)
         {
             LoadURLPacket loadURL = (LoadURLPacket)PacketPool.Instance.GetPacket(PacketType.LoadURL);
-            loadURL.Data.ObjectName = Utils.StringToBytes(objectname);
+            loadURL.Data.ObjectName = Util.StringToBytes256(objectname);
             loadURL.Data.ObjectID = objectID;
             loadURL.Data.OwnerID = ownerID;
             loadURL.Data.OwnerIsGroup = groupOwned;
-            loadURL.Data.Message = Utils.StringToBytes(message);
-            loadURL.Data.URL = Utils.StringToBytes(url);
+            loadURL.Data.Message = Util.StringToBytes256(message);
+            loadURL.Data.URL = Util.StringToBytes256(url);
             OutPacket(loadURL, ThrottleOutPacketType.Task);
         }
 
@@ -1948,18 +1964,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
             dialog.Data.ObjectID = objectID;
-            dialog.Data.ObjectName = Utils.StringToBytes(objectname);
+            dialog.Data.ObjectName = Util.StringToBytes256(objectname);
             // this is the username of the *owner*
-            dialog.Data.FirstName = Utils.StringToBytes(ownerFirstName);
-            dialog.Data.LastName = Utils.StringToBytes(ownerLastName);
-            dialog.Data.Message = Utils.StringToBytes(msg);
+            dialog.Data.FirstName = Util.StringToBytes256(ownerFirstName);
+            dialog.Data.LastName = Util.StringToBytes256(ownerLastName);
+            dialog.Data.Message = Util.StringToBytes1024(msg);
             dialog.Data.ImageID = textureID;
             dialog.Data.ChatChannel = ch;
             ScriptDialogPacket.ButtonsBlock[] buttons = new ScriptDialogPacket.ButtonsBlock[buttonlabels.Length];
             for (int i = 0; i < buttonlabels.Length; i++)
             {
                 buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Utils.StringToBytes(buttonlabels[i]);
+                buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
             }
             dialog.Buttons = buttons;
             OutPacket(dialog, ThrottleOutPacketType.Task);
@@ -2115,19 +2131,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             avatarReply.AgentData.AgentID = AgentId;
             avatarReply.AgentData.AvatarID = avatarID;
             if (aboutText != null)
-                avatarReply.PropertiesData.AboutText = Utils.StringToBytes(aboutText);
+                avatarReply.PropertiesData.AboutText = Util.StringToBytes1024(aboutText);
             else
-                avatarReply.PropertiesData.AboutText = Utils.StringToBytes("");
-            avatarReply.PropertiesData.BornOn = Utils.StringToBytes(bornOn);
+                avatarReply.PropertiesData.AboutText = Utils.EmptyBytes;
+            avatarReply.PropertiesData.BornOn = Util.StringToBytes256(bornOn);
             avatarReply.PropertiesData.CharterMember = charterMember;
             if (flAbout != null)
-                avatarReply.PropertiesData.FLAboutText = Utils.StringToBytes(flAbout);
+                avatarReply.PropertiesData.FLAboutText = Util.StringToBytes256(flAbout);
             else
-                avatarReply.PropertiesData.FLAboutText = Utils.StringToBytes("");
+                avatarReply.PropertiesData.FLAboutText = Utils.EmptyBytes;
             avatarReply.PropertiesData.Flags = flags;
             avatarReply.PropertiesData.FLImageID = flImageID;
             avatarReply.PropertiesData.ImageID = imageID;
-            avatarReply.PropertiesData.ProfileURL = Utils.StringToBytes(profileURL);
+            avatarReply.PropertiesData.ProfileURL = Util.StringToBytes256(profileURL);
             avatarReply.PropertiesData.PartnerID = partnerID;
             OutPacket(avatarReply, ThrottleOutPacketType.Task);
         }
@@ -2254,7 +2270,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Group.Contribution = GroupMembership[i].Contribution;
                 Group.GroupID = GroupMembership[i].GroupID;
                 Group.GroupInsigniaID = GroupMembership[i].GroupPicture;
-                Group.GroupName = Utils.StringToBytes(GroupMembership[i].GroupName);
+                Group.GroupName = Util.StringToBytes256(GroupMembership[i].GroupName);
                 Group.GroupPowers = GroupMembership[i].GroupPowers;
                 Groups[i] = Group;
 
@@ -2288,7 +2304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             UUIDGroupNameReplyPacket.UUIDNameBlockBlock[] uidnameblock = new UUIDGroupNameReplyPacket.UUIDNameBlockBlock[1];
             UUIDGroupNameReplyPacket.UUIDNameBlockBlock uidnamebloc = new UUIDGroupNameReplyPacket.UUIDNameBlockBlock();
             uidnamebloc.ID = groupLLUID;
-            uidnamebloc.GroupName = Utils.StringToBytes(GroupName);
+            uidnamebloc.GroupName = Util.StringToBytes256(GroupName);
             uidnameblock[0] = uidnamebloc;
             pack.UUIDNameBlock = uidnameblock;
             OutPacket(pack, ThrottleOutPacketType.Task);
@@ -2313,8 +2329,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 lsrepdb.Score = lsrpia[i].Score;
                 lsrepdb.TaskID = lsrpia[i].TaskID;
                 lsrepdb.TaskLocalID = lsrpia[i].TaskLocalID;
-                lsrepdb.TaskName = Utils.StringToBytes(lsrpia[i].TaskName);
-                lsrepdb.OwnerName = Utils.StringToBytes(lsrpia[i].OwnerName);
+                lsrepdb.TaskName = Util.StringToBytes256(lsrpia[i].TaskName);
+                lsrepdb.OwnerName = Util.StringToBytes256(lsrpia[i].OwnerName);
                 lsrepdba[i] = lsrepdb;
             }
             lsrp.ReportData = lsrepdba;
@@ -3102,9 +3118,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 awb.ItemID = wearables[i].ItemID;
                 aw.WearableData[i] = awb;
 
-//                m_log.DebugFormat(
-//                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
-//                    awb.ItemID, awb.AssetID, i, Name);
+                //                m_log.DebugFormat(
+                //                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
+                //                    awb.ItemID, awb.AssetID, i, Name);
             }
 
             OutPacket(aw, ThrottleOutPacketType.Task);
@@ -3127,7 +3143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             avp.Sender.IsTrial = false;
             avp.Sender.ID = agentID;
-            OutPacket(avp, ThrottleOutPacketType.State);
+            OutPacket(avp, ThrottleOutPacketType.Task);
         }
 
         public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
@@ -3159,123 +3175,174 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #endregion
 
-        #region Avatar Packet/data sending Methods
+        #region Prim/Avatar Updates
 
-        /// <summary>
-        /// send a objectupdate packet with information about the clients avatar
-        /// </summary>
-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
-                                   uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        /*void SendObjectUpdate(SceneObjectPart obj, PrimFlags creatorFlags, PrimUpdateFlags updateFlags)
         {
-            ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
-            // TODO: don't create new blocks if recycling an old packet
-            objupdate.RegionData.RegionHandle = regionHandle;
-            objupdate.RegionData.TimeDilation = ushort.MaxValue;
-            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            objupdate.ObjectData[0] = CreateDefaultAvatarPacket(textureEntry);
+            bool canUseCompressed, canUseImproved;
+            UpdateFlagsToPacketType(creatorFlags, updateFlags, out canUseCompressed, out canUseImproved);
+
+            if (!canUseImproved && !canUseCompressed)
+                SendFullObjectUpdate(obj, creatorFlags, updateFlags);
+            else if (!canUseImproved)
+                SendObjectUpdateCompressed(obj, creatorFlags, updateFlags);
+            else
+                SendImprovedTerseObjectUpdate(obj, creatorFlags, updateFlags);
+        }
 
-            //give this avatar object a local id and assign the user a name
-            objupdate.ObjectData[0].ID = avatarLocalID;
-            objupdate.ObjectData[0].FullID = avatarID;
-            objupdate.ObjectData[0].ParentID = parentID;
-            objupdate.ObjectData[0].NameValue =
-                Utils.StringToBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + "\nTitle STRING RW SV " + grouptitle);
+        void SendFullObjectUpdate(SceneObjectPart obj, PrimFlags creatorFlags, PrimUpdateFlags updateFlags)
+        {
+            IClientAPI owner;
+            if (m_scene.ClientManager.TryGetValue(obj.OwnerID, out owner) && owner is LLClientView)
+            {
+                LLClientView llOwner = (LLClientView)owner;
 
-            Vector3 pos2 = new Vector3(Pos.X, Pos.Y, Pos.Z);
-            byte[] pb = pos2.GetBytes();
-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
+                // Send an update out to the owner
+                ObjectUpdatePacket updateToOwner = new ObjectUpdatePacket();
+                updateToOwner.RegionData.RegionHandle = obj.RegionHandle;
+                //updateToOwner.RegionData.TimeDilation = (ushort)(timeDilation * (float)UInt16.MaxValue);
+                updateToOwner.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+                updateToOwner.ObjectData[0] = BuildUpdateBlock(obj, obj.Flags | creatorFlags | PrimFlags.ObjectYouOwner, 0);
 
-            byte[] rot = rotation.GetBytes();
-            Array.Copy(rot, 0, objupdate.ObjectData[0].ObjectData, 52, rot.Length);
+                m_udpServer.SendPacket(llOwner.UDPClient, updateToOwner, ThrottleOutPacketType.State, true);
+            }
 
-            objupdate.Header.Zerocoded = true;
-            OutPacket(objupdate, ThrottleOutPacketType.Task);
+            // Send an update out to everyone else
+            ObjectUpdatePacket updateToOthers = new ObjectUpdatePacket();
+            updateToOthers.RegionData.RegionHandle = obj.RegionHandle;
+            //updateToOthers.RegionData.TimeDilation = (ushort)(timeDilation * (float)UInt16.MaxValue);
+            updateToOthers.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            updateToOthers.ObjectData[0] = BuildUpdateBlock(obj, obj.Flags, 0);
+
+            m_scene.ClientManager.ForEach(
+                delegate(IClientAPI client)
+                {
+                    if (client.AgentId != obj.OwnerID && client is LLClientView)
+                    {
+                        LLClientView llClient = (LLClientView)client;
+                        m_udpServer.SendPacket(llClient.UDPClient, updateToOthers, ThrottleOutPacketType.State, true);
+                    }
+                }
+            );
         }
 
-        /// <summary>
-        /// Send a terse positional/rotation/velocity update about an avatar
-        /// to the client.  This avatar can be that of the client itself.
-        /// </summary>
-        public virtual void SendAvatarTerseUpdate(ulong regionHandle,
-                ushort timeDilation, uint localID, Vector3 position,
-                Vector3 velocity, Quaternion rotation, UUID agentid)
+        void SendObjectUpdateCompressed(SceneObjectPart obj, PrimFlags creatorFlags, PrimUpdateFlags updateFlags)
         {
-            if (rotation.X == rotation.Y &&
-                rotation.Y == rotation.Z &&
-                rotation.Z == rotation.W && rotation.W == 0)
-                rotation = Quaternion.Identity;
+        }
 
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock =
-                CreateAvatarImprovedBlock(localID, position, velocity,rotation);
-                
-            lock (m_avatarTerseUpdates)
-            {
-                m_avatarTerseUpdates.Add(terseBlock);
+        void SendImprovedTerseObjectUpdate(SceneObjectPart obj, PrimFlags creatorFlags, PrimUpdateFlags updateFlags)
+        {
+        }
+
+        void UpdateFlagsToPacketType(PrimFlags creatorFlags, PrimUpdateFlags updateFlags, out bool canUseCompressed, out bool canUseImproved)
+        {
+            canUseCompressed = true;
+            canUseImproved = true;
 
-                // If packet is full or own movement packet, send it.
-                if (m_avatarTerseUpdates.Count >= m_avatarTerseUpdatesPerPacket)
+            if ((updateFlags & PrimUpdateFlags.FullUpdate) == PrimUpdateFlags.FullUpdate || creatorFlags != PrimFlags.None)
+            {
+                canUseCompressed = false;
+                canUseImproved = false;
+            }
+            else
+            {
+                if ((updateFlags & PrimUpdateFlags.Velocity) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Acceleration) != 0 ||
+                    (updateFlags & PrimUpdateFlags.CollisionPlane) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Joint) != 0)
                 {
-                    ProcessAvatarTerseUpdates(this, null);
+                    canUseCompressed = false;
                 }
-                else if (m_avatarTerseUpdates.Count == 1)
+
+                if ((updateFlags & PrimUpdateFlags.PrimFlags) != 0 ||
+                    (updateFlags & PrimUpdateFlags.ParentID) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Scale) != 0 ||
+                    (updateFlags & PrimUpdateFlags.PrimData) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Text) != 0 ||
+                    (updateFlags & PrimUpdateFlags.NameValue) != 0 ||
+                    (updateFlags & PrimUpdateFlags.ExtraData) != 0 ||
+                    (updateFlags & PrimUpdateFlags.TextureAnim) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Sound) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Particles) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Material) != 0 ||
+                    (updateFlags & PrimUpdateFlags.ClickAction) != 0 ||
+                    (updateFlags & PrimUpdateFlags.MediaURL) != 0 ||
+                    (updateFlags & PrimUpdateFlags.Joint) != 0)
                 {
-                    lock (m_avatarTerseUpdateTimer)
-                        m_avatarTerseUpdateTimer.Start();
+                    canUseImproved = false;
                 }
             }
-        }
+        }*/
+
+        #endregion Prim/Avatar Updates
 
-        private void ProcessAvatarTerseUpdates(object sender, ElapsedEventArgs e)
+        #region Avatar Packet/Data Sending Methods
+
+        /// <summary>
+        /// Send an ObjectUpdate packet with information about an avatar
+        /// </summary>
+        public void SendAvatarData(SendAvatarData data)
         {
-            lock (m_avatarTerseUpdates)
-            {
-                ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+            objupdate.Header.Zerocoded = true;
 
-                terse.RegionData = new ImprovedTerseObjectUpdatePacket.RegionDataBlock();
+            objupdate.RegionData.RegionHandle = data.RegionHandle;
+            objupdate.RegionData.TimeDilation = ushort.MaxValue;
 
-                terse.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
-                terse.RegionData.TimeDilation =
-                        (ushort)(Scene.TimeDilation * ushort.MaxValue);
+            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data);
 
-                int max = m_avatarTerseUpdatesPerPacket;
-                if (max > m_avatarTerseUpdates.Count)
-                    max = m_avatarTerseUpdates.Count;
+            OutPacket(objupdate, ThrottleOutPacketType.Task);
+        }
 
-                int count = 0;
-                int size = 0;
+        /// <summary>
+        /// Send a terse positional/rotation/velocity update about an avatar
+        /// to the client.  This avatar can be that of the client itself.
+        /// </summary>
+        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
+        {
+            if (data.Priority == double.NaN)
+            {
+                m_log.Error("[LLClientView] SendAvatarTerseUpdate received a NaN priority, dropping update");
+                return;
+            }
 
-                byte[] zerobuffer = new byte[1024];
-                byte[] blockbuffer = new byte[1024];
+            Quaternion rotation = data.Rotation;
+            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
+                rotation = Quaternion.Identity;
 
-                for (count = 0 ; count < max ; count++)
-                {
-                    int length = 0;
-                    m_avatarTerseUpdates[count].ToBytes(blockbuffer, ref length);
-                    length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
-                    if (size + length > Packet.MTU)
-                        break;
-                    size += length;
-                }
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateImprovedTerseBlock(data);
 
-                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
+            lock (m_avatarTerseUpdates.SyncRoot)
+                m_avatarTerseUpdates.Enqueue(data.Priority, terseBlock, data.LocalID);
 
-                for (int i = 0 ; i < count ; i++)
-                {
-                    terse.ObjectData[i] = m_avatarTerseUpdates[0];
-                    m_avatarTerseUpdates.RemoveAt(0);
-                }
+            // If we received an update about our own avatar, process the avatar update priority queue immediately
+            if (data.AgentID == m_agentId)
+                ProcessAvatarTerseUpdates();
+        }
 
-                terse.Header.Reliable = false;
-                terse.Header.Zerocoded = true;
-                // FIXME: Move this to ThrottleOutPacketType.State when the real prioritization code is committed
-                OutPacket(terse, ThrottleOutPacketType.Task);
+        private void ProcessAvatarTerseUpdates()
+        {
+            ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            terse.Header.Reliable = false;
+            terse.Header.Zerocoded = true;
 
-                if (m_avatarTerseUpdates.Count == 0)
-                {
-                    lock (m_avatarTerseUpdateTimer)
-                        m_avatarTerseUpdateTimer.Stop();
-                }
+            //terse.RegionData = new ImprovedTerseObjectUpdatePacket.RegionDataBlock();
+            terse.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
+            terse.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
+
+            lock (m_avatarTerseUpdates.SyncRoot)
+            {
+                int count = Math.Min(m_avatarTerseUpdates.Count, m_avatarTerseUpdatesPerPacket);
+                if (count == 0)
+                    return;
+
+                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
+                for (int i = 0; i < count; i++)
+                    terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue();
             }
+
+            OutPacket(terse, ThrottleOutPacketType.Task);
         }
 
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
@@ -3294,7 +3361,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 CoarseLocationUpdatePacket.LocationBlock lb =
                     new CoarseLocationUpdatePacket.LocationBlock();
-                
+
                 lb.X = (byte)CoarseLocations[i].X;
                 lb.Y = (byte)CoarseLocations[i].Y;
 
@@ -3314,319 +3381,211 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(loc, ThrottleOutPacketType.Task);
         }
 
-        #endregion
+        #endregion Avatar Packet/Data Sending Methods
 
-        #region Primitive Packet/data Sending Methods
+        #region Primitive Packet/Data Sending Methods
 
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="rotation"></param>
-        /// <param name="attachPoint"></param>
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
+        public void SendPrimitiveToClient(SendPrimitiveData data)
         {
-            if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD
+            if (data.priority == double.NaN)
+            {
+                m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update");
                 return;
+            }
 
-            ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
-            // TODO: don't create new blocks if recycling an old packet
-            attach.AgentData.AgentID = AgentId;
-            attach.AgentData.SessionID = m_sessionId;
-            attach.AgentData.AttachmentPoint = attachPoint;
-            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
-            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
-            attach.ObjectData[0].ObjectLocalID = localID;
-            attach.ObjectData[0].Rotation = rotation;
-            attach.Header.Zerocoded = true;
-            OutPacket(attach, ThrottleOutPacketType.Task);
-        }
-
-        public void SendPrimitiveToClient(
-                                          ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-                                          Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
-                                          uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
-                                          uint parentID, byte[] particleSystem, byte clickAction, byte material)
-        {
-            byte[] textureanim = new byte[0];
-
-            SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, vel,
-                                  acc, rotation, rvel, flags,
-                                  objectID, ownerID, text, color, parentID, particleSystem,
-                                  clickAction, material, textureanim, false, 0, UUID.Zero, UUID.Zero, 0, 0, 0);
-        }
-
-        public void SendPrimitiveToClient(
-            ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-            Vector3 pos, Vector3 velocity, Vector3 acceleration, Quaternion rotation, Vector3 rotational_velocity,
-            uint flags,
-            UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem,
-            byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundGain, byte SoundFlags, double SoundRadius)
-        {
+            Quaternion rotation = data.rotation;
+            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
+                rotation = Quaternion.Identity;
 
-            if (AttachPoint > 30 && ownerID != AgentId) // Someone else's HUD
+            if (data.AttachPoint > 30 && data.ownerID != AgentId) // Someone else's HUD
                 return;
-            if (primShape.PCode == 9 && primShape.State != 0 && parentID == 0)
+            if (data.primShape.State != 0 && data.parentID == 0 && data.primShape.PCode == 9)
                 return;
 
-            if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0)
-                rotation = Quaternion.Identity;
+            ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data);
 
-            ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(primShape, flags);
+            lock (m_primFullUpdates.SyncRoot)
+                m_primFullUpdates.Enqueue(data.priority, objectData, data.localID);
+        }
 
-            objectData.ID = localID;
-            objectData.FullID = objectID;
-            objectData.OwnerID = ownerID;
+        void ProcessPrimFullUpdates()
+        {
+            ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+            outPacket.Header.Zerocoded = true;
 
-            objectData.Text = Util.StringToBytes256(text);
-            objectData.TextColor[0] = color[0];
-            objectData.TextColor[1] = color[1];
-            objectData.TextColor[2] = color[2];
-            objectData.TextColor[3] = color[3];
-            objectData.ParentID = parentID;
-            objectData.PSBlock = particleSystem;
-            objectData.ClickAction = clickAction;
-            objectData.Material = material;
-            objectData.Flags = 0;
+            outPacket.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
+            outPacket.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
 
-            if (attachment)
+            lock (m_primFullUpdates.SyncRoot)
             {
-                // Necessary???
-                objectData.JointAxisOrAnchor = new Vector3(0, 0, 2);
-                objectData.JointPivot = new Vector3(0, 0, 0);
-
-                // Item from inventory???
-                objectData.NameValue =
-                    Utils.StringToBytes("AttachItemID STRING RW SV " + AssetId.Guid);
-                objectData.State = (byte)((AttachPoint % 16) * 16 + (AttachPoint / 16));
-            }
+                int count = Math.Min(m_primFullUpdates.Count, m_primFullUpdatesPerPacket);
+                if (count == 0)
+                    return;
 
-            // Xantor 20080528: Send sound info as well
-            // Xantor 20080530: Zero out everything if there's no SoundId, so zerocompression will work again
-            objectData.Sound = SoundId;
-            if (SoundId == UUID.Zero)
-            {
-                objectData.OwnerID = UUID.Zero;
-                objectData.Gain = 0.0f;
-                objectData.Radius = 0.0f;
-                objectData.Flags = 0;
-            }
-            else
-            {
-                objectData.OwnerID = ownerID;
-                objectData.Gain = (float)SoundGain;
-                objectData.Radius = (float)SoundRadius;
-                objectData.Flags = SoundFlags;
+                outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count];
+                for (int i = 0; i < count; i++)
+                    outPacket.ObjectData[i] = m_primFullUpdates.Dequeue();
             }
 
-            byte[] pb = pos.GetBytes();
-            Array.Copy(pb, 0, objectData.ObjectData, 0, pb.Length);
-
-            byte[] vel = velocity.GetBytes();
-            Array.Copy(vel, 0, objectData.ObjectData, pb.Length, vel.Length);
-
-            byte[] rot = rotation.GetBytes();
-            Array.Copy(rot, 0, objectData.ObjectData, 36, rot.Length);
-
-            byte[] rvel = rotational_velocity.GetBytes();
-            Array.Copy(rvel, 0, objectData.ObjectData, 36 + rot.Length, rvel.Length);
+            OutPacket(outPacket, ThrottleOutPacketType.State);
+        }
 
-            if (textureanim.Length > 0)
+        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        {
+            if (data.Priority == double.NaN)
             {
-                objectData.TextureAnim = textureanim;
+                m_log.Error("[LLClientView] SendPrimTerseUpdate received a NaN priority, dropping update");
+                return;
             }
 
-            lock (m_primFullUpdates)
-            {
-                if (m_primFullUpdates.Count == 0)
-                    m_primFullUpdateTimer.Start();
+            Quaternion rotation = data.Rotation;
+            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
+                rotation = Quaternion.Identity;
 
-                m_primFullUpdates.Add(objectData);
+            if (data.AttachPoint > 30 && data.OwnerID != AgentId) // Someone else's HUD
+                return;
 
-                if (m_primFullUpdates.Count >= m_primFullUpdatesPerPacket)
-                    ProcessPrimFullUpdates(this, null);
-            }
-        }
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock objectData = CreateImprovedTerseBlock(data);
 
-        void HandleQueueEmpty(ThrottleOutPacketType queue)
-        {
-            switch (queue)
-            {
-                case ThrottleOutPacketType.Texture:
-                    ProcessTextureRequests();
-                    break;
-            }
+            lock (m_primTerseUpdates.SyncRoot)
+                m_primTerseUpdates.Enqueue(data.Priority, objectData, data.LocalID);
         }
 
-        void ProcessTextureRequests()
+        void ProcessPrimTerseUpdates()
         {
-            if (m_imageManager != null)
-                m_imageManager.ProcessImageQueue(m_textureSendLimit);
-        }
+            ImprovedTerseObjectUpdatePacket outPacket = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+            outPacket.Header.Reliable = false;
+            outPacket.Header.Zerocoded = true;
 
-        void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)
-        {
-            lock (m_primFullUpdates)
-            {
-                if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
-                {
-                    lock (m_primFullUpdateTimer)
-                        m_primFullUpdateTimer.Stop();
+            outPacket.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
+            outPacket.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
 
+            lock (m_primTerseUpdates.SyncRoot)
+            {
+                int count = Math.Min(m_primTerseUpdates.Count, m_primTerseUpdatesPerPacket);
+                if (count == 0)
                     return;
-                }
-
-                ObjectUpdatePacket outPacket =
-                        (ObjectUpdatePacket)PacketPool.Instance.GetPacket(
-                        PacketType.ObjectUpdate);
 
-                outPacket.RegionData.RegionHandle =
-                        Scene.RegionInfo.RegionHandle;
-                outPacket.RegionData.TimeDilation =
-                        (ushort)(Scene.TimeDilation * ushort.MaxValue);
-
-                int max = m_primFullUpdates.Count;
-                if (max > m_primFullUpdatesPerPacket)
-                    max = m_primFullUpdatesPerPacket;
-
-                int count = 0;
-                int size = 0;
+                outPacket.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
+                for (int i = 0; i < count; i++)
+                    outPacket.ObjectData[i] = m_primTerseUpdates.Dequeue();
+            }
 
-                byte[] zerobuffer = new byte[1024];
-                byte[] blockbuffer = new byte[1024];
+            OutPacket(outPacket, ThrottleOutPacketType.State);
+        }
 
-                for (count = 0 ; count < max ; count++)
+        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        {
+            PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>.UpdatePriorityHandler terse_update_priority_handler =
+                delegate(ref double priority, uint local_id)
                 {
-                    int length = 0;
-                    m_primFullUpdates[count].ToBytes(blockbuffer, ref length);
-                    length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
-                    if (size + length > Packet.MTU)
-                        break;
-                    size += length;
-                }
+                    priority = handler(new UpdatePriorityData(priority, local_id));
+                    return priority != double.NaN;
+                };
+            PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>.UpdatePriorityHandler update_priority_handler =
+                delegate(ref double priority, uint local_id)
+                {
+                    priority = handler(new UpdatePriorityData(priority, local_id));
+                    return priority != double.NaN;
+                };
 
-                outPacket.ObjectData =
-                        new ObjectUpdatePacket.ObjectDataBlock[count];
+            if ((type & StateUpdateTypes.AvatarTerse) != 0)
+            {
+                lock (m_avatarTerseUpdates.SyncRoot)
+                    m_avatarTerseUpdates.Reprioritize(terse_update_priority_handler);
+            }
 
-                for (int index = 0 ; index < count ; index++)
-                {
-                    outPacket.ObjectData[index] = m_primFullUpdates[0];
-                    m_primFullUpdates.RemoveAt(0);
-                }
+            if ((type & StateUpdateTypes.PrimitiveFull) != 0)
+            {
+                lock (m_primFullUpdates.SyncRoot)
+                    m_primFullUpdates.Reprioritize(update_priority_handler);
+            }
 
-                outPacket.Header.Zerocoded = true;
-                OutPacket(outPacket, ThrottleOutPacketType.State);
+            if ((type & StateUpdateTypes.PrimitiveTerse) != 0)
+            {
+                lock (m_primTerseUpdates.SyncRoot)
+                    m_primTerseUpdates.Reprioritize(terse_update_priority_handler);
+            }
+        }
 
-                if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
-                    lock (m_primFullUpdateTimer)
-                        m_primFullUpdateTimer.Stop();
+        public void FlushPrimUpdates()
+        {
+            while (m_primFullUpdates.Count > 0)
+            {
+                ProcessPrimFullUpdates();
+            }
+            while (m_primTerseUpdates.Count > 0)
+            {
+                ProcessPrimTerseUpdates();
+            }
+            while (m_avatarTerseUpdates.Count > 0)
+            {
+                ProcessAvatarTerseUpdates();
             }
         }
 
+        #endregion Primitive Packet/Data Sending Methods
+
         /// <summary>
         ///
         /// </summary>
-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-                                        Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint)
+        /// <param name="localID"></param>
+        /// <param name="rotation"></param>
+        /// <param name="attachPoint"></param>
+        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
         {
             if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD
                 return;
 
-            if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0)
-                rotation = Quaternion.Identity;
-
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock objectData =
-                    CreatePrimImprovedBlock(localID, position, rotation,
-                    velocity, rotationalvelocity, state);
-
-            lock (m_primTerseUpdates)
-            {
-                if (m_primTerseUpdates.Count == 0)
-                    m_primTerseUpdateTimer.Start();
-
-                m_primTerseUpdates.Add(objectData);
-
-                if (m_primTerseUpdates.Count >= m_primTerseUpdatesPerPacket)
-                    ProcessPrimTerseUpdates(this, null);
-            }
+            ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
+            // TODO: don't create new blocks if recycling an old packet
+            attach.AgentData.AgentID = AgentId;
+            attach.AgentData.SessionID = m_sessionId;
+            attach.AgentData.AttachmentPoint = attachPoint;
+            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
+            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
+            attach.ObjectData[0].ObjectLocalID = localID;
+            attach.ObjectData[0].Rotation = rotation;
+            attach.Header.Zerocoded = true;
+            OutPacket(attach, ThrottleOutPacketType.Task);
         }
 
-        void ProcessPrimTerseUpdates(object sender, ElapsedEventArgs e)
+        void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
         {
-            lock (m_primTerseUpdates)
+            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
             {
-                if (m_primTerseUpdates.Count == 0)
+                lock (m_avatarTerseUpdates.SyncRoot)
                 {
-                    lock (m_primTerseUpdateTimer)
-                        m_primTerseUpdateTimer.Stop();
-
-                    return;
+                    if (m_avatarTerseUpdates.Count > 0)
+                        ProcessAvatarTerseUpdates();
                 }
+            }
 
-                ImprovedTerseObjectUpdatePacket outPacket =
-                        (ImprovedTerseObjectUpdatePacket)
-                        PacketPool.Instance.GetPacket(
-                        PacketType.ImprovedTerseObjectUpdate);
-
-                outPacket.RegionData.RegionHandle =
-                        Scene.RegionInfo.RegionHandle;
-                outPacket.RegionData.TimeDilation =
-                        (ushort)(Scene.TimeDilation * ushort.MaxValue);
-
-                int max = m_primTerseUpdates.Count;
-                if (max > m_primTerseUpdatesPerPacket)
-                    max = m_primTerseUpdatesPerPacket;
-
-                int count = 0;
-                int size = 0;
-
-                byte[] zerobuffer = new byte[1024];
-                byte[] blockbuffer = new byte[1024];
-
-                for (count = 0 ; count < max ; count++)
+            if ((categories & ThrottleOutPacketTypeFlags.State) != 0)
+            {
+                lock (m_primFullUpdates.SyncRoot)
                 {
-                    int length = 0;
-                    m_primTerseUpdates[count].ToBytes(blockbuffer, ref length);
-                    length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer);
-                    if (size + length > Packet.MTU)
-                        break;
-                    size += length;
+                    if (m_primFullUpdates.Count > 0)
+                        ProcessPrimFullUpdates();
                 }
 
-                outPacket.ObjectData =
-                        new ImprovedTerseObjectUpdatePacket.
-                        ObjectDataBlock[count];
-
-                for (int index = 0 ; index < count ; index++)
+                lock (m_primTerseUpdates.SyncRoot)
                 {
-                    outPacket.ObjectData[index] = m_primTerseUpdates[0];
-                    m_primTerseUpdates.RemoveAt(0);
+                    if (m_primTerseUpdates.Count > 0)
+                        ProcessPrimTerseUpdates();
                 }
+            }
 
-                outPacket.Header.Reliable = false;
-                outPacket.Header.Zerocoded = true;
-                OutPacket(outPacket, ThrottleOutPacketType.State);
-
-                if (m_primTerseUpdates.Count == 0)
-                    lock (m_primTerseUpdateTimer)
-                        m_primTerseUpdateTimer.Stop();
+            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
+            {
+                ProcessTextureRequests();
             }
         }
 
-        public void FlushPrimUpdates()
+        void ProcessTextureRequests()
         {
-            while (m_primFullUpdates.Count > 0)
-            {
-                ProcessPrimFullUpdates(this, null);
-            }
-            while (m_primTerseUpdates.Count > 0)
-            {
-                ProcessPrimTerseUpdates(this, null);
-            }
-            while (m_avatarTerseUpdates.Count > 0)
-            {
-                ProcessAvatarTerseUpdates(this, null);
-            }
+            if (m_imageManager != null)
+                m_imageManager.ProcessImageQueue(m_textureSendLimit);
         }
 
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
@@ -3659,7 +3618,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             newPack.Header.Zerocoded = true;
             OutPacket(newPack, ThrottleOutPacketType.Asset);
         }
-        
+
         public void SendInitiateDownload(string simFileName, string clientFileName)
         {
             InitiateDownloadPacket newPack = new InitiateDownloadPacket();
@@ -3668,7 +3627,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             newPack.FileData.ViewerFilename = Utils.StringToBytes(clientFileName);
             OutPacket(newPack, ThrottleOutPacketType.Asset);
         }
-        
+
         public void SendImageFirstPart(
             ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
         {
@@ -3810,8 +3769,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(proper, ThrottleOutPacketType.Task);
         }
 
-        #endregion
-
         #region Estate Data Sending Methods
 
         private static bool convertParamStringToBool(byte[] field)
@@ -3858,7 +3815,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendBannedUserList(UUID invoice, EstateBan[] bl, uint estateID)
         {
-            List<UUID>BannedUsers = new List<UUID>();
+            List<UUID> BannedUsers = new List<UUID>();
 
             for (int i = 0; i < bl.Length; i++)
             {
@@ -3922,7 +3879,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             rinfoblk.UseEstateSun = args.useEstateSun;
             rinfoblk.WaterHeight = args.waterHeight;
             rinfoblk.SimName = Utils.StringToBytes(args.simName);
-            
+
             rinfopack.RegionInfo2 = new RegionInfoPacket.RegionInfo2Block();
             rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue;
             rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue;
@@ -4169,7 +4126,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
         {
-            
+
 
             int notifyCount = ownersAndCount.Count;
             ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
@@ -4218,325 +4175,223 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Helper Methods
 
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, Vector3 pos,
-                                                                                            Vector3 velocity,
-                                                                                            Quaternion rotation)
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendAvatarTerseData data)
         {
-            byte[] bytes = new byte[60];
-            int i = 0;
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = PacketPool.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-
-            dat.TextureEntry = new byte[0]; // AvatarTemplate.TextureEntry;
-
-            uint ID = 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 = pos.GetBytes();
-            Array.Copy(pb, 0, bytes, i, pb.Length);
-            i += 12;
-
-            Vector3 internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);
-
-            internDirec = internDirec / 128.0f;
-            internDirec.X += 1;
-            internDirec.Y += 1;
-            internDirec.Z += 1;
-
-            ushort InternVelocityX = (ushort)(32768 * internDirec.X);
-            ushort InternVelocityY = (ushort)(32768 * internDirec.Y);
-            ushort 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);
-
-            //rotation
-            ushort rw, rx, ry, rz;
-            rw = (ushort)(32768 * (rotation.W + 1));
-            rx = (ushort)(32768 * (rotation.X + 1));
-            ry = (ushort)(32768 * (rotation.Y + 1));
-            rz = (ushort)(32768 * (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);
+            return CreateImprovedTerseBlock(true, data.LocalID, 0, data.CollisionPlane, data.Position, data.Velocity,
+                data.Acceleration, data.Rotation, Vector3.Zero, data.TextureEntry);
         }
 
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="position"></param>
-        /// <param name="rotation"></param>
-        /// <returns></returns>
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID,
-                                                                                          Vector3 position,
-                                                                                          Quaternion rotation,
-                                                                                          Vector3 velocity,
-                                                                                          Vector3 rotationalvelocity,
-                                                                                          byte state)
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendPrimitiveTerseData data)
         {
-            uint ID = localID;
-            byte[] bytes = new byte[60];
-
-            int i = 0;
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = PacketPool.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            dat.TextureEntry = new byte[0];
-            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++] = (byte)(((state & 0xf0) >> 4) | ((state & 0x0f) << 4));
-            bytes[i++] = 0;
-
-            byte[] pb = position.GetBytes();
-            Array.Copy(pb, 0, bytes, i, pb.Length);
-            i += 12;
-            ushort ac = 32767;
-
-            ushort velx, vely, velz;
-            Vector3 vel = new Vector3(velocity.X, velocity.Y, velocity.Z);
-
-            vel = vel / 128.0f;
-            vel.X += 1;
-            vel.Y += 1;
-            vel.Z += 1;
-            //vel
-            velx = (ushort)(32768 * (vel.X));
-            vely = (ushort)(32768 * (vel.Y));
-            velz = (ushort)(32768 * (vel.Z));
-
-            bytes[i++] = (byte)(velx % 256);
-            bytes[i++] = (byte)((velx >> 8) % 256);
-            bytes[i++] = (byte)(vely % 256);
-            bytes[i++] = (byte)((vely >> 8) % 256);
-            bytes[i++] = (byte)(velz % 256);
-            bytes[i++] = (byte)((velz >> 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 * (rotation.W + 1));
-            rx = (ushort)(32768 * (rotation.X + 1));
-            ry = (ushort)(32768 * (rotation.Y + 1));
-            rz = (ushort)(32768 * (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
-            Vector3 rvel = new Vector3(rotationalvelocity.X, rotationalvelocity.Y, rotationalvelocity.Z);
-
-            rvel = rvel / 128.0f;
-            rvel.X += 1;
-            rvel.Y += 1;
-            rvel.Z += 1;
-            //vel
-            ushort rvelx = (ushort)(32768 * (rvel.X));
-            ushort rvely = (ushort)(32768 * (rvel.Y));
-            ushort rvelz = (ushort)(32768 * (rvel.Z));
-
-            bytes[i++] = (byte)(rvelx % 256);
-            bytes[i++] = (byte)((rvelx >> 8) % 256);
-            bytes[i++] = (byte)(rvely % 256);
-            bytes[i++] = (byte)((rvely >> 8) % 256);
-            bytes[i++] = (byte)(rvelz % 256);
-            bytes[i++] = (byte)((rvelz >> 8) % 256);
-            dat.Data = bytes;
-
-            return dat;
+            return CreateImprovedTerseBlock(false, data.LocalID, data.State, Vector4.Zero, data.Position, data.Velocity,
+                data.Acceleration, data.Rotation, data.AngularVelocity, data.TextureEntry);
         }
 
-        /// <summary>
-        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)
-        /// </summary>
-        /// <param name="primData"></param>
-        /// <returns></returns>
-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, uint flags)
-        {
-            ObjectUpdatePacket.ObjectDataBlock objupdate = PacketPool.GetDataBlock<ObjectUpdatePacket.ObjectDataBlock>();
-            SetDefaultPrimPacketValues(objupdate);
-            objupdate.UpdateFlags = flags;
-            SetPrimPacketShapeData(objupdate, primShape);
-
-            if ((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass))
-            {
-                objupdate.Data = new byte[1];
-                objupdate.Data[0] = primShape.State;
-            }
-            return objupdate;
-        }
-
-        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimitiveBaseShape primData)
-        {
-            objectData.TextureEntry = primData.TextureEntry;
-            objectData.PCode = primData.PCode;
-            objectData.State = primData.State;
-            objectData.PathBegin = primData.PathBegin;
-            objectData.PathEnd = primData.PathEnd;
-            objectData.PathScaleX = primData.PathScaleX;
-            objectData.PathScaleY = primData.PathScaleY;
-            objectData.PathShearX = primData.PathShearX;
-            objectData.PathShearY = primData.PathShearY;
-            objectData.PathSkew = primData.PathSkew;
-            objectData.ProfileBegin = primData.ProfileBegin;
-            objectData.ProfileEnd = primData.ProfileEnd;
-            objectData.Scale = primData.Scale;
-            objectData.PathCurve = primData.PathCurve;
-            objectData.ProfileCurve = primData.ProfileCurve;
-            objectData.ProfileHollow = primData.ProfileHollow;
-            objectData.PathRadiusOffset = primData.PathRadiusOffset;
-            objectData.PathRevolutions = primData.PathRevolutions;
-            objectData.PathTaperX = primData.PathTaperX;
-            objectData.PathTaperY = primData.PathTaperY;
-            objectData.PathTwist = primData.PathTwist;
-            objectData.PathTwistBegin = primData.PathTwistBegin;
-            objectData.ExtraParams = primData.ExtraParams;
-        }
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(bool avatar, uint localID, byte state,
+            Vector4 collisionPlane, Vector3 position, Vector3 velocity, Vector3 acceleration, Quaternion rotation,
+            Vector3 angularVelocity, byte[] textureEntry)
+        {
+            int pos = 0;
+            byte[] data = new byte[(avatar ? 60 : 44)];
 
-        /// <summary>
-        /// Set some default values in a ObjectUpdatePacket
-        /// </summary>
-        /// <param name="objdata"></param>
-        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
-        {
-            objdata.PSBlock = new byte[0];
-            objdata.ExtraParams = new byte[1];
-            objdata.MediaURL = new byte[0];
-            objdata.NameValue = new byte[0];
-            objdata.Text = new byte[0];
-            objdata.TextColor = new byte[4];
-            objdata.JointAxisOrAnchor = new Vector3(0, 0, 0);
-            objdata.JointPivot = new Vector3(0, 0, 0);
-            objdata.Material = 3;
-            objdata.TextureAnim = new byte[0];
-            objdata.Sound = UUID.Zero;
-            objdata.State = 0;
-            objdata.Data = new byte[0];
-
-            objdata.ObjectData = new byte[60];
-            objdata.ObjectData[46] = 128;
-            objdata.ObjectData[47] = 63;
-        }
+            // LocalID
+            Utils.UIntToBytes(localID, data, pos);
+            pos += 4;
 
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
-        {
-            ObjectUpdatePacket.ObjectDataBlock objdata = PacketPool.GetDataBlock<ObjectUpdatePacket.ObjectDataBlock>();
-            //  new OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+            // Avatar/CollisionPlane
+            data[pos++] = state;
+            if (avatar)
+            {
+                data[pos++] = 1;
+
+                if (collisionPlane == Vector4.Zero)
+                    collisionPlane = Vector4.UnitW;
 
-            SetDefaultAvatarPacketValues(ref objdata);
-            objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
-            objdata.PathCurve = 16;
-            objdata.ProfileCurve = 1;
-            objdata.PathScaleX = 100;
-            objdata.PathScaleY = 100;
-            objdata.ParentID = 0;
-            objdata.OwnerID = UUID.Zero;
-            objdata.Scale = new Vector3(1, 1, 1);
-            objdata.PCode = (byte)PCode.Avatar;
-            if (textureEntry != null)
+                collisionPlane.ToBytes(data, pos);
+                pos += 16;
+            }
+            else
             {
-                objdata.TextureEntry = textureEntry;
+                ++pos;
             }
-            Vector3 pos = new Vector3(objdata.ObjectData, 16);
-            pos.X = 100f;
-            objdata.ID = 8880000;
-            objdata.NameValue = Utils.StringToBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User ");
-            //Vector3 pos2 = new Vector3(100f, 100f, 23f);
-            //objdata.FullID=user.AgentId;
-            byte[] pb = pos.GetBytes();
-            Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
 
-            return objdata;
-        }
+            // Position
+            position.ToBytes(data, pos);
+            pos += 12;
 
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="objdata"></param>
-        protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)
-        {
-            objdata.PSBlock = new byte[0];
-            objdata.ExtraParams = new byte[1];
-            objdata.MediaURL = new byte[0];
-            objdata.NameValue = new byte[0];
-            objdata.Text = new byte[0];
-            objdata.TextColor = new byte[4];
-            objdata.JointAxisOrAnchor = new Vector3(0, 0, 0);
-            objdata.JointPivot = new Vector3(0, 0, 0);
-            objdata.Material = 4;
-            objdata.TextureAnim = new byte[0];
-            objdata.Sound = UUID.Zero;
-            Primitive.TextureEntry ntex = new Primitive.TextureEntry(new UUID("00000000-0000-0000-5005-000000000005"));
-            objdata.TextureEntry = ntex.GetBytes();
-
-            objdata.State = 0;
-            objdata.Data = new byte[0];
-
-            objdata.ObjectData = new byte[76];
-            objdata.ObjectData[15] = 128;
-            objdata.ObjectData[16] = 63;
-            objdata.ObjectData[56] = 128;
-            objdata.ObjectData[61] = 102;
-            objdata.ObjectData[62] = 40;
-            objdata.ObjectData[63] = 61;
-            objdata.ObjectData[64] = 189;
+            // Velocity
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.X, -128.0f, 128.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Y, -128.0f, 128.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(velocity.Z, -128.0f, 128.0f), data, pos); pos += 2;
+
+            // Acceleration
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.X, -64.0f, 64.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Y, -64.0f, 64.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(acceleration.Z, -64.0f, 64.0f), data, pos); pos += 2;
+
+            // Rotation
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.X, -1.0f, 1.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.Y, -1.0f, 1.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.Z, -1.0f, 1.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(rotation.W, -1.0f, 1.0f), data, pos); pos += 2;
+
+            // Angular Velocity
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.X, -64.0f, 64.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Y, -64.0f, 64.0f), data, pos); pos += 2;
+            Utils.UInt16ToBytes(Utils.FloatToUInt16(angularVelocity.Z, -64.0f, 64.0f), data, pos); pos += 2;
+
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock block = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+            block.Data = data;
+
+            if (textureEntry != null && textureEntry.Length > 0)
+            {
+                byte[] teBytesFinal = new byte[textureEntry.Length + 4];
+
+                // Texture Length
+                Utils.IntToBytes(textureEntry.Length, textureEntry, 0);
+                // Texture
+                Buffer.BlockCopy(textureEntry, 0, teBytesFinal, 4, textureEntry.Length);
+
+                block.TextureEntry = teBytesFinal;
+            }
+            else
+            {
+                block.TextureEntry = Utils.EmptyBytes;
+            }
+
+            return block;
+        }
+
+        protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(SendAvatarData data)
+        {
+            byte[] objectData = new byte[76];
+
+            Vector4.UnitW.ToBytes(objectData, 0); // TODO: Collision plane support
+            data.Position.ToBytes(objectData, 16);
+            //data.Velocity.ToBytes(objectData, 28);
+            //data.Acceleration.ToBytes(objectData, 40);
+            data.Rotation.ToBytes(objectData, 52);
+            //data.AngularVelocity.ToBytes(objectData, 64);
+
+            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
+
+            update.Data = Utils.EmptyBytes;
+            update.ExtraParams = new byte[1];
+            update.FullID = data.AvatarID;
+            update.ID = data.AvatarLocalID;
+            update.Material = (byte)Material.Flesh;
+            update.MediaURL = Utils.EmptyBytes;
+            update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.FirstName + "\nLastName STRING RW SV " +
+                data.LastName + "\nTitle STRING RW SV " + data.GroupTitle);
+            update.ObjectData = objectData;
+            update.ParentID = data.ParentID;
+            update.PathCurve = 16;
+            update.PathScaleX = 100;
+            update.PathScaleY = 100;
+            update.PCode = (byte)PCode.Avatar;
+            update.ProfileCurve = 1;
+            update.PSBlock = Utils.EmptyBytes;
+            update.Scale = Vector3.One;
+            update.Text = Utils.EmptyBytes;
+            update.TextColor = new byte[4];
+            update.TextureAnim = Utils.EmptyBytes;
+            update.TextureEntry = data.TextureEntry ?? Utils.EmptyBytes;
+            update.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); // TODO: Replace these numbers with PrimFlags
+
+            return update;
+        }
+
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SendPrimitiveData data)
+        {
+            byte[] objectData = new byte[60];
+            data.pos.ToBytes(objectData, 0);
+            data.vel.ToBytes(objectData, 12);
+            data.acc.ToBytes(objectData, 24);
+            data.rotation.ToBytes(objectData, 36);
+            data.rvel.ToBytes(objectData, 48);
+
+            ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
+            update.ClickAction = (byte)data.clickAction;
+            update.CRC = 0;
+            update.ExtraParams = data.primShape.ExtraParams ?? Utils.EmptyBytes;
+            update.FullID = data.objectID;
+            update.ID = data.localID;
+            //update.JointAxisOrAnchor = Vector3.Zero; // These are deprecated
+            //update.JointPivot = Vector3.Zero;
+            //update.JointType = 0;
+            update.Material = data.material;
+            update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
+            if (data.attachment)
+            {
+                update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.AssetId);
+                update.State = (byte)((data.AttachPoint % 16) * 16 + (data.AttachPoint / 16));
+            }
+            else
+            {
+                update.NameValue = Utils.EmptyBytes;
+                update.State = data.primShape.State;
+            }
+            update.ObjectData = objectData;
+            update.ParentID = data.parentID;
+            update.PathBegin = data.primShape.PathBegin;
+            update.PathCurve = data.primShape.PathCurve;
+            update.PathEnd = data.primShape.PathEnd;
+            update.PathRadiusOffset = data.primShape.PathRadiusOffset;
+            update.PathRevolutions = data.primShape.PathRevolutions;
+            update.PathScaleX = data.primShape.PathScaleX;
+            update.PathScaleY = data.primShape.PathScaleY;
+            update.PathShearX = data.primShape.PathShearX;
+            update.PathShearY = data.primShape.PathShearY;
+            update.PathSkew = data.primShape.PathSkew;
+            update.PathTaperX = data.primShape.PathTaperX;
+            update.PathTaperY = data.primShape.PathTaperY;
+            update.PathTwist = data.primShape.PathTwist;
+            update.PathTwistBegin = data.primShape.PathTwistBegin;
+            update.PCode = data.primShape.PCode;
+            update.ProfileBegin = data.primShape.ProfileBegin;
+            update.ProfileCurve = data.primShape.ProfileCurve;
+            update.ProfileEnd = data.primShape.ProfileEnd;
+            update.ProfileHollow = data.primShape.ProfileHollow;
+            update.PSBlock = data.particleSystem ?? Utils.EmptyBytes;
+            update.TextColor = data.color ?? Color4.Black.GetBytes(true);
+            update.TextureAnim = data.textureanim ?? Utils.EmptyBytes;
+            update.TextureEntry = data.primShape.TextureEntry ?? Utils.EmptyBytes;
+            update.Scale = data.primShape.Scale;
+            update.Text = Util.StringToBytes256(data.text);
+            update.UpdateFlags = (uint)data.flags;
+
+            if (data.SoundId != UUID.Zero)
+            {
+                update.Sound = data.SoundId;
+                update.OwnerID = data.ownerID;
+                update.Gain = (float)data.SoundVolume;
+                update.Radius = (float)data.SoundRadius;
+                update.Flags = data.SoundFlags;
+            }
+
+            switch ((PCode)data.primShape.PCode)
+            {
+                case PCode.Grass:
+                case PCode.Tree:
+                case PCode.NewTree:
+                    update.Data = new byte[] { data.primShape.State };
+                    break;
+                default:
+                    // TODO: Support ScratchPad
+                    //if (prim.ScratchPad != null)
+                    //{
+                    //    update.Data = new byte[prim.ScratchPad.Length];
+                    //    Buffer.BlockCopy(prim.ScratchPad, 0, update.Data, 0, update.Data.Length);
+                    //}
+                    //else
+                    //{
+                    //    update.Data = Utils.EmptyBytes;
+                    //}
+                    update.Data = Utils.EmptyBytes;
+                    break;
+            }
+
+            return update;
         }
 
         public void SendNameReply(UUID profileId, string firstname, string lastname)
@@ -4546,8 +4401,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             packet.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[1];
             packet.UUIDNameBlock[0] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
             packet.UUIDNameBlock[0].ID = profileId;
-            packet.UUIDNameBlock[0].FirstName = Utils.StringToBytes(firstname);
-            packet.UUIDNameBlock[0].LastName = Utils.StringToBytes(lastname);
+            packet.UUIDNameBlock[0].FirstName = Util.StringToBytes256(firstname);
+            packet.UUIDNameBlock[0].LastName = Util.StringToBytes256(lastname);
 
             OutPacket(packet, ThrottleOutPacketType.Task);
         }
@@ -4593,7 +4448,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private bool HandleMoneyTransferRequest(IClientAPI sender, Packet Pack)
         {
-            MoneyTransferRequestPacket money = (MoneyTransferRequestPacket) Pack;
+            MoneyTransferRequestPacket money = (MoneyTransferRequestPacket)Pack;
             // validate the agent owns the agentID and sessionID
             if (money.MoneyData.SourceID == sender.AgentId && money.AgentData.AgentID == sender.AgentId &&
                 money.AgentData.SessionID == sender.SessionId)
@@ -4614,7 +4469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private bool HandleParcelBuyRequest(IClientAPI sender, Packet Pack)
         {
-            ParcelBuyPacket parcel = (ParcelBuyPacket) Pack;
+            ParcelBuyPacket parcel = (ParcelBuyPacket)Pack;
             if (parcel.AgentData.AgentID == AgentId && parcel.AgentData.SessionID == SessionId)
             {
                 ParcelBuy handlerParcelBuy = OnParcelBuy;
@@ -4634,7 +4489,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack)
         {
             UUIDGroupNameRequestPacket upack = (UUIDGroupNameRequestPacket)Pack;
-            
+
 
             for (int i = 0; i < upack.UUIDNameBlock.Length; i++)
             {
@@ -4650,7 +4505,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public bool HandleGenericMessage(IClientAPI sender, Packet pack)
         {
-            GenericMessagePacket gmpack = (GenericMessagePacket) pack;
+            GenericMessagePacket gmpack = (GenericMessagePacket)pack;
             if (m_genericPacketHandlers.Count == 0) return false;
             if (gmpack.AgentData.SessionID != SessionId) return false;
 
@@ -4743,8 +4598,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             scriptQuestion.Data.TaskID = taskID;
             scriptQuestion.Data.ItemID = itemID;
             scriptQuestion.Data.Questions = question;
-            scriptQuestion.Data.ObjectName = Utils.StringToBytes(taskName);
-            scriptQuestion.Data.ObjectOwner = Utils.StringToBytes(ownerName);
+            scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName);
+            scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName);
 
             OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
         }
@@ -4787,7 +4642,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (((LogoutRequestPacket)packet).AgentData.SessionID != SessionId) return false;
             }
-            
+
             return Logout(client);
         }
 
@@ -4845,7 +4700,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             cachedresp.Header.Zerocoded = true;
             OutPacket(cachedresp, ThrottleOutPacketType.Task);
-            
+
             return true;
         }
 
@@ -4895,7 +4750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
                                 if (handlerUpdatePrimSingleRotation != null)
                                 {
-                                   // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
+                                    // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
                                     handlerUpdatePrimSingleRotation(localId, rot1, this);
                                 }
                                 break;
@@ -4906,8 +4761,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition;
                                 if (handlerUpdatePrimSingleRotationPosition != null)
                                 {
-                                   // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
-                                   // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
+                                    // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
+                                    // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
                                     handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
                                 }
                                 break;
@@ -4918,7 +4773,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale;
                                 if (handlerUpdatePrimScale != null)
                                 {
-//                                     m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
+                                    //                                     m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
                                     handlerUpdatePrimScale(localId, scale4, this);
                                 }
                                 break;
@@ -4957,7 +4812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
                                 if (handlerUpdatePrimRotation != null)
                                 {
-                                  //  Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
+                                    //  Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
                                     handlerUpdatePrimRotation(localId, rot3, this);
                                 }
                                 break;
@@ -4968,8 +4823,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
                                 if (handlerUpdatePrimGroupRotation != null)
                                 {
-                                  //  m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                   // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
+                                    //  m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                                    // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
                                     handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
                                 }
                                 break;
@@ -4980,7 +4835,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
                                 if (handlerUpdatePrimGroupScale != null)
                                 {
-//                                     m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
+                                    //                                     m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
                                     handlerUpdatePrimGroupScale(localId, scale7, this);
                                 }
                                 break;
@@ -5138,7 +4993,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_moneyBalance + debit >= 0)
             {
                 m_moneyBalance += debit;
-                SendMoneyBalance(UUID.Zero, true, Utils.StringToBytes("Poof Poof!"), m_moneyBalance);
+                SendMoneyBalance(UUID.Zero, true, Util.StringToBytes256("Poof Poof!"), m_moneyBalance);
                 return true;
             }
             return false;
@@ -5212,7 +5067,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Main packet processing conditional
             switch (Pack.Type)
             {
-                    #region Scene/Avatar
+                #region Scene/Avatar
 
                 case PacketType.AvatarPropertiesRequest:
                     AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
@@ -5463,7 +5318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
 
                 case PacketType.DeRezObject:
-                    DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack;
+                    DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)Pack;
 
                     #region Packet Session and User Check
                     if (m_checkPackets)
@@ -5484,13 +5339,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         {
                             deRezIDs.Add(data.ObjectLocalID);
                         }
-                            // It just so happens that the values on the DeRezAction enumerator match the Destination
-                            // values given by a Second Life client
-                            handlerDeRezObject(this, deRezIDs,
-                                               DeRezPacket.AgentBlock.GroupID,
-                                               (DeRezAction)DeRezPacket.AgentBlock.Destination,
-                                               DeRezPacket.AgentBlock.DestinationID);
-                        
+                        // It just so happens that the values on the DeRezAction enumerator match the Destination
+                        // values given by a Second Life client
+                        handlerDeRezObject(this, deRezIDs,
+                                           DeRezPacket.AgentBlock.GroupID,
+                                           (DeRezAction)DeRezPacket.AgentBlock.Destination,
+                                           DeRezPacket.AgentBlock.DestinationID);
+
                     }
                     break;
 
@@ -5594,7 +5449,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
 
                     break;
-                
+
                 case PacketType.AgentIsNowWearing:
                     if (OnAvatarNowWearing != null)
                     {
@@ -5798,7 +5653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                         if (lastarg != null)
                         {
-                            update = 
+                            update =
                                (
                                 (x.BodyRotation != lastarg.BodyRotation) ||
                                 (x.CameraAtAxis != lastarg.CameraAtAxis) ||
@@ -5991,7 +5846,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
 
                     break;
-                
+
                 case PacketType.UserInfoRequest:
                     UserInfoRequest handlerUserInfoRequest = OnUserInfoRequest;
                     if (handlerUserInfoRequest != null)
@@ -6003,7 +5858,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         SendUserInfoReply(false, true, "");
                     }
                     break;
-                
+
                 case PacketType.UpdateUserInfo:
                     UpdateUserInfoPacket updateUserInfo = (UpdateUserInfoPacket)Pack;
 
@@ -6030,7 +5885,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 visible, this);
                     }
                     break;
-                
+
                 case PacketType.SetStartLocationRequest:
                     SetStartLocationRequestPacket avSetStartLocationRequestPacket = (SetStartLocationRequestPacket)Pack;
 
@@ -6088,9 +5943,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Objects/m_sceneObjects
+                #region Objects/m_sceneObjects
 
                 case PacketType.ObjectLink:
                     ObjectLinkPacket link = (ObjectLinkPacket)Pack;
@@ -6121,7 +5976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         handlerLinkObjects(this, parentprimid, childrenprims);
                     }
                     break;
-                
+
                 case PacketType.ObjectDelink:
                     ObjectDelinkPacket delink = (ObjectDelinkPacket)Pack;
 
@@ -6150,7 +6005,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
 
                     break;
-                
+
                 case PacketType.ObjectAdd:
                     if (OnAddPrim != null)
                     {
@@ -6180,7 +6035,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             handlerAddPrim(AgentId, ActiveGroupId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection);
                     }
                     break;
-                
+
                 case PacketType.ObjectShape:
                     ObjectShapePacket shapePacket = (ObjectShapePacket)Pack;
 
@@ -6225,7 +6080,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
                     break;
-                
+
                 case PacketType.ObjectExtraParams:
                     ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket)Pack;
 
@@ -6241,7 +6096,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     ObjectExtraParams handlerUpdateExtraParams = OnUpdateExtraParams;
                     if (handlerUpdateExtraParams != null)
                     {
-                        for (int i = 0 ; i <  extraPar.ObjectData.Length ; i++)
+                        for (int i = 0; i < extraPar.ObjectData.Length; i++)
                         {
                             handlerUpdateExtraParams(m_agentId, extraPar.ObjectData[i].ObjectLocalID,
                                                      extraPar.ObjectData[i].ParamType,
@@ -6642,7 +6497,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.ObjectName:
                     ObjectNamePacket objName = (ObjectNamePacket)Pack;
-                    
+
                     #region Packet Session and User Check
                     if (m_checkPackets)
                     {
@@ -6651,7 +6506,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             break;
                     }
                     #endregion
-                    
+
                     GenericCall7 handlerObjectName = null;
                     for (int i = 0; i < objName.ObjectData.Length; i++)
                     {
@@ -6884,14 +6739,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Inventory/Asset/Other related packets
+                #region Inventory/Asset/Other related packets
 
                 case PacketType.RequestImage:
                     RequestImagePacket imageRequest = (RequestImagePacket)Pack;
                     //m_log.Debug("image request: " + Pack.ToString());
-                    
+
                     #region Packet Session and User Check
                     if (m_checkPackets)
                     {
@@ -6915,7 +6770,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             //handlerTextureRequest = OnRequestTexture;
 
                             //if (handlerTextureRequest != null)
-                                //OnRequestTexture(this, args);
+                            //OnRequestTexture(this, args);
 
                             // in the end, we null this, so we have to check if it's null
                             if (m_imageManager != null)
@@ -6961,7 +6816,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 if (ti.OwnerID != AgentId)
                                     break;
 
-                                if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                                if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
                                     break;
 
                                 if (ti.AssetID != requestID)
@@ -7019,7 +6874,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 case PacketType.AssetUploadRequest:
                     AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
 
-                    
+
                     // m_log.Debug("upload request " + request.ToString());
                     // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
                     UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
@@ -7036,7 +6891,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.RequestXfer:
                     RequestXferPacket xferReq = (RequestXferPacket)Pack;
-                    
+
                     RequestXfer handlerRequestXfer = OnRequestXfer;
 
                     if (handlerRequestXfer != null)
@@ -7055,7 +6910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.ConfirmXferPacket:
                     ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack;
-                    
+
                     ConfirmXfer handlerConfirmXfer = OnConfirmXfer;
                     if (handlerConfirmXfer != null)
                     {
@@ -7150,7 +7005,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.CreateInventoryItem:
                     CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
-                    
+
                     #region Packet Session and User Check
                     if (m_checkPackets)
                     {
@@ -7243,7 +7098,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.UpdateInventoryItem:
                     UpdateInventoryItemPacket inventoryItemUpdate = (UpdateInventoryItemPacket)Pack;
-                    
+
                     #region Packet Session and User Check
                     if (m_checkPackets)
                     {
@@ -7735,7 +7590,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
                 case PacketType.UUIDNameRequest:
                     UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
@@ -7750,7 +7605,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #region Parcel related packets
+                #region Parcel related packets
 
                 case PacketType.RegionHandleRequest:
                     RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
@@ -8131,9 +7986,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Estate Packets
+                #region Estate Packets
 
                 case PacketType.EstateOwnerMessage:
                     EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
@@ -8167,21 +8022,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                                         convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter));
                             }
                             break;
-//                            case "texturebase":
-//                                if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
-//                                {
-//                                    foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
-//                                    {
-//                                        string s = Utils.BytesToString(block.Parameter);
-//                                        string[] splitField = s.Split(' ');
-//                                        if (splitField.Length == 2)
-//                                        {
-//                                            UUID tempUUID = new UUID(splitField[1]);
-//                                            OnSetEstateTerrainBaseTexture(this, Convert.ToInt16(splitField[0]), tempUUID);
-//                                        }
-//                                    }
-//                                }
-//                                break;
+                        //                            case "texturebase":
+                        //                                if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
+                        //                                {
+                        //                                    foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
+                        //                                    {
+                        //                                        string s = Utils.BytesToString(block.Parameter);
+                        //                                        string[] splitField = s.Split(' ');
+                        //                                        if (splitField.Length == 2)
+                        //                                        {
+                        //                                            UUID tempUUID = new UUID(splitField[1]);
+                        //                                            OnSetEstateTerrainBaseTexture(this, Convert.ToInt16(splitField[0]), tempUUID);
+                        //                                        }
+                        //                                    }
+                        //                                }
+                        //                                break;
                         case "texturedetail":
                             if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false))
                             {
@@ -8423,7 +8278,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket);
                             break;
                     }
- 
+
                     //int parcelID, uint reportType, uint requestflags, string filter
 
                     //lsrp.RequestData.ParcelLocalID;
@@ -8463,9 +8318,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region GodPackets
+                #region GodPackets
 
                 case PacketType.RequestGodlikePowers:
                     RequestGodlikePowersPacket rglpPack = (RequestGodlikePowersPacket)Pack;
@@ -8511,9 +8366,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     //OutPacket(kupack, ThrottleOutPacketType.Task);
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Economy/Transaction Packets
+                #region Economy/Transaction Packets
 
                 case PacketType.MoneyBalanceRequest:
                     MoneyBalanceRequestPacket moneybalancerequestpacket = (MoneyBalanceRequestPacket)Pack;
@@ -8537,7 +8392,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     break;
                 case PacketType.EconomyDataRequest:
 
-                    
+
                     EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
                     if (handlerEconomoyDataRequest != null)
                     {
@@ -8613,9 +8468,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Script Packets
+                #region Script Packets
 
                 case PacketType.GetScriptRunning:
                     GetScriptRunningPacket scriptRunning = (GetScriptRunningPacket)Pack;
@@ -8665,9 +8520,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
+                #endregion
 
-                    #region Gesture Managment
+                #region Gesture Managment
 
                 case PacketType.ActivateGestures:
                     ActivateGesturesPacket activateGesturePacket = (ActivateGesturesPacket)Pack;
@@ -8734,21 +8589,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
 
-                    #endregion
-
+                #endregion
 
-                    #region unimplemented handlers
+                case PacketType.AgentFOV:
+                    AgentFOVPacket fovPacket = (AgentFOVPacket)Pack;
 
-                case PacketType.StartPingCheck:
-                    StartPingCheckPacket pingStart = (StartPingCheckPacket)Pack;
-                    CompletePingCheckPacket pingComplete = new CompletePingCheckPacket();
-                    pingComplete.PingID.PingID = pingStart.PingID.PingID;
-                    m_udpServer.SendPacket(m_udpClient, pingComplete, ThrottleOutPacketType.Unknown, false);
+                    if (fovPacket.FOVBlock.GenCounter > m_agentFOVCounter)
+                    {
+                        m_agentFOVCounter = fovPacket.FOVBlock.GenCounter;
+                        AgentFOV handlerAgentFOV = OnAgentFOV;
+                        if (handlerAgentFOV != null)
+                        {
+                            handlerAgentFOV(this, fovPacket.FOVBlock.VerticalAngle);
+                        }
+                    }
                     break;
 
-                case PacketType.CompletePingCheck:
-                    // TODO: Do stats tracking or something with these?
-                    break;
+                #region unimplemented handlers
 
                 case PacketType.ViewerStats:
                     // TODO: handle this packet
@@ -8771,8 +8628,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     MapItemRequest handlerMapItemRequest = OnMapItemRequest;
                     if (handlerMapItemRequest != null)
                     {
-                        handlerMapItemRequest(this,mirpk.AgentData.Flags, mirpk.AgentData.EstateID,
-                                              mirpk.AgentData.Godlike,mirpk.RequestData.ItemType,
+                        handlerMapItemRequest(this, mirpk.AgentData.Flags, mirpk.AgentData.EstateID,
+                                              mirpk.AgentData.Godlike, mirpk.RequestData.ItemType,
                                               mirpk.RequestData.RegionHandle);
 
                     }
@@ -9080,7 +8937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 new GroupTitlesReplyPacket.GroupDataBlock();
 
                             groupTitlesReply.GroupData[i].Title =
-                                Utils.StringToBytes(d.Name);
+                                Util.StringToBytes256(d.Name);
                             groupTitlesReply.GroupData[i].RoleID =
                                 d.UUID;
                             groupTitlesReply.GroupData[i].Selected =
@@ -9117,10 +8974,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                                                                 groupProfileRequest.GroupData.GroupID);
 
                         groupProfileReply.GroupData.GroupID = d.GroupID;
-                        groupProfileReply.GroupData.Name = Utils.StringToBytes(d.Name);
-                        groupProfileReply.GroupData.Charter = Utils.StringToBytes(d.Charter);
+                        groupProfileReply.GroupData.Name = Util.StringToBytes256(d.Name);
+                        groupProfileReply.GroupData.Charter = Util.StringToBytes1024(d.Charter);
                         groupProfileReply.GroupData.ShowInList = d.ShowInList;
-                        groupProfileReply.GroupData.MemberTitle = Utils.StringToBytes(d.MemberTitle);
+                        groupProfileReply.GroupData.MemberTitle = Util.StringToBytes256(d.MemberTitle);
                         groupProfileReply.GroupData.PowersMask = d.PowersMask;
                         groupProfileReply.GroupData.InsigniaID = d.InsigniaID;
                         groupProfileReply.GroupData.FounderID = d.FounderID;
@@ -9180,7 +9037,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 groupMembersRequestPacket.GroupData.RequestID;
                             groupMembersReply.GroupData.MemberCount = memberCount;
 
-                            for (int i = 0 ; i < blockCount ; i++)
+                            for (int i = 0; i < blockCount; i++)
                             {
                                 GroupMembersData m = members[0];
                                 members.RemoveAt(0);
@@ -9192,11 +9049,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 groupMembersReply.MemberData[i].Contribution =
                                     m.Contribution;
                                 groupMembersReply.MemberData[i].OnlineStatus =
-                                    Utils.StringToBytes(m.OnlineStatus);
+                                    Util.StringToBytes256(m.OnlineStatus);
                                 groupMembersReply.MemberData[i].AgentPowers =
                                     m.AgentPowers;
                                 groupMembersReply.MemberData[i].Title =
-                                    Utils.StringToBytes(m.Title);
+                                    Util.StringToBytes256(m.Title);
                                 groupMembersReply.MemberData[i].IsOwner =
                                     m.IsOwner;
                             }
@@ -9257,11 +9114,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             groupRolesReply.RoleData[i].RoleID =
                                 d.RoleID;
                             groupRolesReply.RoleData[i].Name =
-                                Utils.StringToBytes(d.Name);
+                                Util.StringToBytes256(d.Name);
                             groupRolesReply.RoleData[i].Title =
-                                Utils.StringToBytes(d.Title);
+                                Util.StringToBytes256(d.Title);
                             groupRolesReply.RoleData[i].Description =
-                                Utils.StringToBytes(d.Description);
+                                Util.StringToBytes1024(d.Description);
                             groupRolesReply.RoleData[i].Powers =
                                 d.Powers;
                             groupRolesReply.RoleData[i].Members =
@@ -9317,7 +9174,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             groupRoleMembersReply.MemberData =
                                     new GroupRoleMembersReplyPacket.MemberDataBlock[pairs];
 
-                            for (int i = 0 ; i < pairs ; i++)
+                            for (int i = 0; i < pairs; i++)
                             {
                                 GroupRoleMembersData d = mappings[0];
                                 mappings.RemoveAt(0);
@@ -9444,7 +9301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         ParcelDeedToGroup handlerParcelDeedToGroup = OnParcelDeedToGroup;
                         if (handlerParcelDeedToGroup != null)
                         {
-                            handlerParcelDeedToGroup(parcelDeedToGroup.Data.LocalID, parcelDeedToGroup.Data.GroupID,this);
+                            handlerParcelDeedToGroup(parcelDeedToGroup.Data.LocalID, parcelDeedToGroup.Data.GroupID, this);
 
                         }
                     }
@@ -9488,9 +9345,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             groupNoticesListReply.Data[i].Timestamp =
                                 g.Timestamp;
                             groupNoticesListReply.Data[i].FromName =
-                                Utils.StringToBytes(g.FromName);
+                                Util.StringToBytes256(g.FromName);
                             groupNoticesListReply.Data[i].Subject =
-                                Utils.StringToBytes(g.Subject);
+                                Util.StringToBytes256(g.Subject);
                             groupNoticesListReply.Data[i].HasAttachment =
                                 g.HasAttachment;
                             groupNoticesListReply.Data[i].AssetType =
@@ -9902,7 +9759,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     PickDelete handlerPickDelete = OnPickDelete;
                     if (handlerPickDelete != null)
-                        handlerPickDelete(this, pickDelete.Data.PickID); 
+                        handlerPickDelete(this, pickDelete.Data.PickID);
                     break;
                 case PacketType.PickGodDelete:
                     PickGodDeletePacket pickGodDelete =
@@ -9922,7 +9779,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         handlerPickGodDelete(this,
                                 pickGodDelete.AgentData.AgentID,
                                 pickGodDelete.Data.PickID,
-                                pickGodDelete.Data.QueryID); 
+                                pickGodDelete.Data.QueryID);
                     break;
                 case PacketType.PickInfoUpdate:
                     PickInfoUpdatePacket pickInfoUpdate =
@@ -10013,7 +9870,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_log.Warn("[CLIENT]: unhandled packet " + Pack);
                     break;
 
-                    #endregion
+                #endregion
             }
 
             PacketPool.Instance.ReturnPacket(Pack);
@@ -10050,7 +9907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //shape.Textures = ntex;
             return shape;
         }
-        
+
         public ClientInfo GetClientInfo()
         {
             ClientInfo info = m_udpClient.GetClientInfo();
@@ -10078,7 +9935,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket();
             commandMessagePacket.CommandBlock.Flags = flags;
-            commandMessagePacket.CommandBlock.Command =(uint) command;
+            commandMessagePacket.CommandBlock.Command = (uint)command;
             commandMessagePacket.CommandBlock.Time = time;
 
             OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown);
@@ -10089,12 +9946,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                    byte mediaLoop)
         {
             ParcelMediaUpdatePacket updatePacket = new ParcelMediaUpdatePacket();
-            updatePacket.DataBlock.MediaURL = Utils.StringToBytes(mediaUrl);
+            updatePacket.DataBlock.MediaURL = Util.StringToBytes256(mediaUrl);
             updatePacket.DataBlock.MediaID = mediaTextureID;
             updatePacket.DataBlock.MediaAutoScale = autoScale;
 
-            updatePacket.DataBlockExtended.MediaType = Utils.StringToBytes(mediaType);
-            updatePacket.DataBlockExtended.MediaDesc = Utils.StringToBytes(mediaDesc);
+            updatePacket.DataBlockExtended.MediaType = Util.StringToBytes256(mediaType);
+            updatePacket.DataBlockExtended.MediaDesc = Util.StringToBytes256(mediaDesc);
             updatePacket.DataBlockExtended.MediaWidth = mediaWidth;
             updatePacket.DataBlockExtended.MediaHeight = mediaHeight;
             updatePacket.DataBlockExtended.MediaLoop = mediaLoop;
@@ -10106,7 +9963,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Camera
 
-        public void SendSetFollowCamProperties (UUID objectID, SortedDictionary<int, float> parameters)
+        public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters)
         {
             SetFollowCamPropertiesPacket packet = (SetFollowCamPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.SetFollowCamProperties);
             packet.ObjectData.ObjectID = objectID;
@@ -10124,7 +9981,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(packet, ThrottleOutPacketType.Task);
         }
 
-        public void SendClearFollowCamProperties (UUID objectID)
+        public void SendClearFollowCamProperties(UUID objectID)
         {
             ClearFollowCamPropertiesPacket packet = (ClearFollowCamPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ClearFollowCamProperties);
             packet.ObjectData.ObjectID = objectID;
@@ -10226,8 +10083,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             return m_udpClient.GetStats();
         }
-        
-        public string XReport(string uptime, string version) 
+
+        public string XReport(string uptime, string version)
         {
             return String.Empty;
         }
@@ -10301,7 +10158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
 
                 //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing.  Dropping", requestID);
-                
+
                 // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
                 return;
             }
@@ -10371,5 +10228,167 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             pack.TextureData.TextureID = textureID;
             OutPacket(pack, ThrottleOutPacketType.Task);
         }
+
+        #region PriorityQueue
+        private class PriorityQueue<TPriority, TValue>
+        {
+            internal delegate bool UpdatePriorityHandler(ref TPriority priority, uint local_id);
+
+            private MinHeap<MinHeapItem>[] m_heaps = new MinHeap<MinHeapItem>[1];
+            private Dictionary<uint, LookupItem> m_lookupTable;
+            private Comparison<TPriority> m_comparison;
+            private object m_syncRoot = new object();
+
+            internal PriorityQueue() :
+                this(MinHeap<MinHeapItem>.DEFAULT_CAPACITY, Comparer<TPriority>.Default) { }
+            internal PriorityQueue(int capacity) :
+                this(capacity, Comparer<TPriority>.Default) { }
+            internal PriorityQueue(IComparer<TPriority> comparer) :
+                this(new Comparison<TPriority>(comparer.Compare)) { }
+            internal PriorityQueue(Comparison<TPriority> comparison) :
+                this(MinHeap<MinHeapItem>.DEFAULT_CAPACITY, comparison) { }
+            internal PriorityQueue(int capacity, IComparer<TPriority> comparer) :
+                this(capacity, new Comparison<TPriority>(comparer.Compare)) { }
+            internal PriorityQueue(int capacity, Comparison<TPriority> comparison)
+            {
+                m_lookupTable = new Dictionary<uint, LookupItem>(capacity);
+
+                for (int i = 0; i < m_heaps.Length; ++i)
+                    m_heaps[i] = new MinHeap<MinHeapItem>(capacity);
+                this.m_comparison = comparison;
+            }
+
+            internal object SyncRoot { get { return this.m_syncRoot; } }
+            internal int Count
+            {
+                get
+                {
+                    int count = 0;
+                    for (int i = 0; i < m_heaps.Length; ++i)
+                        count = m_heaps[i].Count;
+                    return count;
+                }
+            }
+
+            internal bool Enqueue(TPriority priority, TValue value, uint local_id)
+            {
+                LookupItem item;
+
+                if (m_lookupTable.TryGetValue(local_id, out item))
+                {
+                    item.Heap[item.Handle] = new MinHeapItem(priority, value, local_id, this.m_comparison);
+                    return false;
+                }
+                else
+                {
+                    item.Heap = m_heaps[0];
+                    item.Heap.Add(new MinHeapItem(priority, value, local_id, this.m_comparison), ref item.Handle);
+                    m_lookupTable.Add(local_id, item);
+                    return true;
+                }
+            }
+
+            internal TValue Peek()
+            {
+                for (int i = 0; i < m_heaps.Length; ++i)
+                    if (m_heaps[i].Count > 0)
+                        return m_heaps[i].Min().Value;
+                throw new InvalidOperationException(string.Format("The {0} is empty", this.GetType().ToString()));
+            }
+
+            internal TValue Dequeue()
+            {
+                for (int i = 0; i < m_heaps.Length; ++i)
+                {
+                    if (m_heaps[i].Count > 0)
+                    {
+                        MinHeapItem item = m_heaps[i].RemoveMin();
+                        m_lookupTable.Remove(item.LocalID);
+                        return item.Value;
+                    }
+                }
+                throw new InvalidOperationException(string.Format("The {0} is empty", this.GetType().ToString()));
+            }
+
+            internal void Reprioritize(UpdatePriorityHandler handler)
+            {
+                MinHeapItem item;
+                TPriority priority;
+
+                foreach (LookupItem lookup in new List<LookupItem>(this.m_lookupTable.Values))
+                {
+                    if (lookup.Heap.TryGetValue(lookup.Handle, out item))
+                    {
+                        priority = item.Priority;
+                        if (handler(ref priority, item.LocalID))
+                        {
+                            if (lookup.Heap.ContainsHandle(lookup.Handle))
+                                lookup.Heap[lookup.Handle] =
+                                    new MinHeapItem(priority, item.Value, item.LocalID, this.m_comparison);
+                        }
+                        else
+                        {
+                            m_log.Warn("[LLCLIENTVIEW]: UpdatePriorityHandler returned false, dropping update");
+                            lookup.Heap.Remove(lookup.Handle);
+                            this.m_lookupTable.Remove(item.LocalID);
+                        }
+                    }
+                }
+            }
+
+            #region MinHeapItem
+            private struct MinHeapItem : IComparable<MinHeapItem>
+            {
+                private TPriority priority;
+                private TValue value;
+                private uint local_id;
+                private Comparison<TPriority> comparison;
+
+                internal MinHeapItem(TPriority priority, TValue value, uint local_id) :
+                    this(priority, value, local_id, Comparer<TPriority>.Default) { }
+                internal MinHeapItem(TPriority priority, TValue value, uint local_id, IComparer<TPriority> comparer) :
+                    this(priority, value, local_id, new Comparison<TPriority>(comparer.Compare)) { }
+                internal MinHeapItem(TPriority priority, TValue value, uint local_id, Comparison<TPriority> comparison)
+                {
+                    this.priority = priority;
+                    this.value = value;
+                    this.local_id = local_id;
+                    this.comparison = comparison;
+                }
+
+                internal TPriority Priority { get { return this.priority; } }
+                internal TValue Value { get { return this.value; } }
+                internal uint LocalID { get { return this.local_id; } }
+
+                public override string ToString()
+                {
+                    StringBuilder sb = new StringBuilder();
+                    sb.Append("[");
+                    if (this.priority != null)
+                        sb.Append(this.priority.ToString());
+                    sb.Append(",");
+                    if (this.value != null)
+                        sb.Append(this.value.ToString());
+                    sb.Append("]");
+                    return sb.ToString();
+                }
+
+                public int CompareTo(MinHeapItem other)
+                {
+                    return this.comparison(this.priority, other.priority);
+                }
+            }
+            #endregion
+
+            #region LookupItem
+            private struct LookupItem
+            {
+                internal MinHeap<MinHeapItem> Heap;
+                internal IHandle Handle;
+            }
+            #endregion
+        }
+        #endregion
+
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index d25bf95..938cf50 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -51,7 +51,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_shuttingdown;
-        private long m_lastloopprocessed;
         private AssetBase m_missingImage;
         private LLClientView m_client; //Client we're assigned to
         private IAssetService m_assetCache; //Asset Cache
@@ -169,7 +168,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public bool ProcessImageQueue(int packetsToSend)
         {
-            m_lastloopprocessed = DateTime.Now.Ticks;
             int packetsSent = 0;
 
             while (packetsSent < packetsToSend)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 4eee6b6..a9bc7d2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -33,6 +33,8 @@ using OpenSim.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 
+using TokenBucket = OpenSim.Region.ClientStack.LindenUDP.TokenBucket;
+
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
     #region Delegates
@@ -48,11 +50,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// are waiting on ACKs for</param>
     public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
     /// <summary>
-    /// Fired when the queue for a packet category is empty. This event can be
-    /// hooked to put more data on the empty queue
+    /// Fired when the queue for one or more packet categories is empty. This 
+    /// event can be hooked to put more data on the empty queues
     /// </summary>
-    /// <param name="category">Category of the packet queue that is empty</param>
-    public delegate void QueueEmpty(ThrottleOutPacketType category);
+    /// <param name="category">Categories of the packet queues that are empty</param>
+    public delegate void QueueEmpty(ThrottleOutPacketTypeFlags categories);
 
     #endregion Delegates
 
@@ -98,12 +100,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>True when this connection is alive, otherwise false</summary>
         public bool IsConnected = true;
         /// <summary>True when this connection is paused, otherwise false</summary>
-        public bool IsPaused = true;
+        public bool IsPaused;
         /// <summary>Environment.TickCount when the last packet was received for this client</summary>
         public int TickLastPacketReceived;
 
-        /// <summary>Timer granularity. This is set to the measured resolution of Environment.TickCount</summary>
-        public readonly float G;
         /// <summary>Smoothed round-trip time. A smoothed average of the round-trip time for sending a
         /// reliable packet to the client and receiving an ACK</summary>
         public float SRTT;
@@ -128,6 +128,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private int m_packetsReceivedReported;
         /// <summary>Total number of sent packets that we have reported to the OnPacketStats event(s)</summary>
         private int m_packetsSentReported;
+        /// <summary>Holds the Environment.TickCount value of when the next OnQueueEmpty can be fired</summary>
+        private int m_nextOnQueueEmpty = 1;
 
         /// <summary>Throttle bucket for this agent's connection</summary>
         private readonly TokenBucket m_throttle;
@@ -140,9 +142,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>A container that can hold one packet for each outbox, used to store
         /// dequeued packets that are being held for throttling</summary>
         private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT];
-        /// <summary>Flags to prevent queue empty callbacks from stacking up on
-        /// top of each other</summary>
-        private readonly bool[] m_onQueueEmptyRunning = new bool[THROTTLE_CATEGORY_COUNT];
         /// <summary>A reference to the LLUDPServer that is managing this client</summary>
         private readonly LLUDPServer m_udpServer;
 
@@ -163,26 +162,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             CircuitCode = circuitCode;
             m_udpServer = server;
             m_defaultThrottleRates = rates;
+            // Create a token bucket throttle for this client that has the scene token bucket as a parent
             m_throttle = new TokenBucket(parentThrottle, rates.TotalLimit, rates.Total);
+            // Create an array of token buckets for this clients different throttle categories
             m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
 
             for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
             {
                 ThrottleOutPacketType type = (ThrottleOutPacketType)i;
 
+                // Initialize the packet outboxes, where packets sit while they are waiting for tokens
                 m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
+                // Initialize the token buckets that control the throttling for each category
                 m_throttleCategories[i] = new TokenBucket(m_throttle, rates.GetLimit(type), rates.GetRate(type));
             }
 
-            // Set the granularity variable used for retransmission calculations to
-            // the measured resolution of Environment.TickCount
-            G = server.TickCountResolution;
-
             // Default the retransmission timeout to three seconds
             RTO = 3000;
 
             // Initialize this to a sane value to prevent early disconnects
-            TickLastPacketReceived = Environment.TickCount;
+            TickLastPacketReceived = Environment.TickCount & Int32.MaxValue;
         }
 
         /// <summary>
@@ -191,7 +190,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void Shutdown()
         {
             IsConnected = false;
-            NeedAcks.Clear();
             for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
             {
                 m_packetOutboxes[i].Clear();
@@ -293,36 +291,59 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             int state = (int)((float)task * STATE_TASK_PERCENTAGE);
             task -= state;
 
-            int ceiling = Int32.MaxValue;
-            if (m_defaultThrottleRates.Total != 0)
-            {
-                ceiling = m_defaultThrottleRates.Total;
-                if (ceiling < Packet.MTU) ceiling = Packet.MTU;
-            }
-
-            resend = Utils.Clamp(resend, Packet.MTU, ceiling);
-            land = Utils.Clamp(land, Packet.MTU, ceiling);
-            wind = Utils.Clamp(wind, Packet.MTU, ceiling);
-            cloud = Utils.Clamp(cloud, Packet.MTU, ceiling);
-            task = Utils.Clamp(task, Packet.MTU, ceiling);
-            texture = Utils.Clamp(texture, Packet.MTU, ceiling);
-            asset = Utils.Clamp(asset, Packet.MTU, ceiling);
-            state = Utils.Clamp(state, Packet.MTU, ceiling);
+            // Make sure none of the throttles are set below our packet MTU,
+            // otherwise a throttle could become permanently clogged
+            resend = Math.Max(resend, LLUDPServer.MTU);
+            land = Math.Max(land, LLUDPServer.MTU);
+            wind = Math.Max(wind, LLUDPServer.MTU);
+            cloud = Math.Max(cloud, LLUDPServer.MTU);
+            task = Math.Max(task, LLUDPServer.MTU);
+            texture = Math.Max(texture, LLUDPServer.MTU);
+            asset = Math.Max(asset, LLUDPServer.MTU);
+            state = Math.Max(state, LLUDPServer.MTU);
 
             int total = resend + land + wind + cloud + task + texture + asset + state;
-            int taskTotal = task + state;
 
             m_log.DebugFormat("[LLUDPCLIENT]: {0} is setting throttles. Resend={1}, Land={2}, Wind={3}, Cloud={4}, Task={5}, Texture={6}, Asset={7}, State={8}, Total={9}",
                 AgentID, resend, land, wind, cloud, task, texture, asset, state, total);
 
-            SetThrottle(ThrottleOutPacketType.Resend, resend, resend);
-            SetThrottle(ThrottleOutPacketType.Land, land, land);
-            SetThrottle(ThrottleOutPacketType.Wind, wind, wind);
-            SetThrottle(ThrottleOutPacketType.Cloud, cloud, cloud);
-            SetThrottle(ThrottleOutPacketType.Task, task, taskTotal);
-            SetThrottle(ThrottleOutPacketType.Texture, texture, texture);
-            SetThrottle(ThrottleOutPacketType.Asset, asset, asset);
-            SetThrottle(ThrottleOutPacketType.State, state, taskTotal);
+            // Update the token buckets with new throttle values
+            TokenBucket bucket;
+
+            bucket = m_throttle;
+            bucket.MaxBurst = total;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
+            bucket.DripRate = resend;
+            bucket.MaxBurst = resend;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
+            bucket.DripRate = land;
+            bucket.MaxBurst = land;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
+            bucket.DripRate = wind;
+            bucket.MaxBurst = wind;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
+            bucket.DripRate = cloud;
+            bucket.MaxBurst = cloud;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
+            bucket.DripRate = asset;
+            bucket.MaxBurst = asset;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
+            bucket.DripRate = task + state;
+            bucket.MaxBurst = task + state;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.State];
+            bucket.DripRate = state;
+            bucket.MaxBurst = state;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
+            bucket.DripRate = texture;
+            bucket.MaxBurst = texture;
         }
 
         public byte[] GetThrottlesPacked()
@@ -342,17 +363,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return data;
         }
 
-        public void SetThrottle(ThrottleOutPacketType category, int rate, int maxBurst)
-        {
-            int i = (int)category;
-            if (i >= 0 && i < m_throttleCategories.Length)
-            {
-                TokenBucket bucket = m_throttleCategories[(int)category];
-                bucket.DripRate = rate;
-                bucket.MaxBurst = maxBurst;
-            }
-        }
-
         public bool EnqueueOutgoing(OutgoingPacket packet)
         {
             int category = (int)packet.Category;
@@ -394,10 +404,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
             TokenBucket bucket;
             bool packetSent = false;
+            ThrottleOutPacketTypeFlags emptyCategories = 0;
+
+            //string queueDebugOutput = String.Empty; // Serious debug business
 
             for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
             {
                 bucket = m_throttleCategories[i];
+                //queueDebugOutput += m_packetOutboxes[i].Count + " ";  // Serious debug business
 
                 if (m_nextPackets[i] != null)
                 {
@@ -438,17 +452,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // empty callback now so it has a chance to fill before we 
                         // get back here
                         if (queue.Count == 0)
-                            BeginFireQueueEmpty(i);
+                            emptyCategories |= CategoryToFlag(i);
                     }
                     else
                     {
                         // No packets in this queue. Fire the queue empty callback
                         // if it has not been called recently
-                        BeginFireQueueEmpty(i);
+                        emptyCategories |= CategoryToFlag(i);
                     }
                 }
             }
 
+            if (emptyCategories != 0)
+                BeginFireQueueEmpty(emptyCategories);
+
+            //m_log.Info("[LLUDPCLIENT]: Queues: " + queueDebugOutput); // Serious debug business
             return packetSent;
         }
 
@@ -479,8 +497,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 SRTT = (1.0f - ALPHA) * SRTT + ALPHA * r;
             }
 
-            // Always round retransmission timeout up to two seconds
-            RTO = Math.Max(2000, (int)(SRTT + Math.Max(G, K * RTTVAR)));
+            RTO = (int)(SRTT + Math.Max(m_udpServer.TickCountResolution, K * RTTVAR));
+
+            // Clamp the retransmission timeout to manageable values
+            RTO = Utils.Clamp(RTO, 3000, 10000);
+
             //m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " +
             //    RTTVAR + " based on new RTT of " + r + "ms");
         }
@@ -491,33 +512,89 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         /// <param name="throttleIndex">Throttle category to fire the callback
         /// for</param>
-        private void BeginFireQueueEmpty(int throttleIndex)
+        private void BeginFireQueueEmpty(ThrottleOutPacketTypeFlags categories)
         {
-            if (!m_onQueueEmptyRunning[throttleIndex])
-                Util.FireAndForget(FireQueueEmpty, throttleIndex);
+            if (m_nextOnQueueEmpty != 0 && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
+            {
+                // Use a value of 0 to signal that FireQueueEmpty is running
+                m_nextOnQueueEmpty = 0;
+                // Asynchronously run the callback
+                Util.FireAndForget(FireQueueEmpty, categories);
+            }
         }
 
         /// <summary>
-        /// Checks to see if this queue empty callback is already running,
-        /// then firing the event
+        /// Fires the OnQueueEmpty callback and sets the minimum time that it
+        /// can be called again
         /// </summary>
-        /// <param name="o">Throttle category to fire the callback for, stored
-        /// as an object to match the WaitCallback delegate signature</param>
+        /// <param name="o">Throttle categories to fire the callback for,
+        /// stored as an object to match the WaitCallback delegate
+        /// signature</param>
         private void FireQueueEmpty(object o)
         {
-            int i = (int)o;
-            ThrottleOutPacketType type = (ThrottleOutPacketType)i;
+            const int MIN_CALLBACK_MS = 30;
+
+            ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
             QueueEmpty callback = OnQueueEmpty;
+            
+            int start = Environment.TickCount & Int32.MaxValue;
 
             if (callback != null)
             {
-                if (!m_onQueueEmptyRunning[i])
-                {
-                    m_onQueueEmptyRunning[i] = true;
-                    try { callback(type); }
-                    catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + type + ") threw an exception: " + e.Message, e); }
-                    m_onQueueEmptyRunning[i] = false;
-                }
+                try { callback(categories); }
+                catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
+            }
+
+            m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
+            if (m_nextOnQueueEmpty == 0)
+                m_nextOnQueueEmpty = 1;
+        }
+
+        /// <summary>
+        /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a
+        /// flag value
+        /// </summary>
+        /// <param name="i">Throttle category to convert</param>
+        /// <returns>Flag representation of the throttle category</returns>
+        private static ThrottleOutPacketTypeFlags CategoryToFlag(int i)
+        {
+            ThrottleOutPacketType category = (ThrottleOutPacketType)i;
+
+            /*
+             * Land = 1,
+        /// <summary>Wind data</summary>
+        Wind = 2,
+        /// <summary>Cloud data</summary>
+        Cloud = 3,
+        /// <summary>Any packets that do not fit into the other throttles</summary>
+        Task = 4,
+        /// <summary>Texture assets</summary>
+        Texture = 5,
+        /// <summary>Non-texture assets</summary>
+        Asset = 6,
+        /// <summary>Avatar and primitive data</summary>
+        /// <remarks>This is a sub-category of Task</remarks>
+        State = 7,
+             */
+
+            switch (category)
+            {
+                case ThrottleOutPacketType.Land:
+                    return ThrottleOutPacketTypeFlags.Land;
+                case ThrottleOutPacketType.Wind:
+                    return ThrottleOutPacketTypeFlags.Wind;
+                case ThrottleOutPacketType.Cloud:
+                    return ThrottleOutPacketTypeFlags.Cloud;
+                case ThrottleOutPacketType.Task:
+                    return ThrottleOutPacketTypeFlags.Task;
+                case ThrottleOutPacketType.Texture:
+                    return ThrottleOutPacketTypeFlags.Texture;
+                case ThrottleOutPacketType.Asset:
+                    return ThrottleOutPacketTypeFlags.Asset;
+                case ThrottleOutPacketType.State:
+                    return ThrottleOutPacketTypeFlags.State;
+                default:
+                    return 0;
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 545a0bc..a9f4b2c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -39,6 +39,8 @@ using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
+using TokenBucket = OpenSim.Region.ClientStack.LindenUDP.TokenBucket;
+
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
     /// <summary>
@@ -89,8 +91,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// </summary>
     public class LLUDPServer : OpenSimUDPBase
     {
+        /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
+        public const int MTU = 1400;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>The measured resolution of Environment.TickCount</summary>
+        public readonly float TickCountResolution;
+
         /// <summary>Handlers for incoming packets</summary>
         //PacketEventDictionary packetEvents = new PacketEventDictionary();
         /// <summary>Incoming packets that are awaiting handling</summary>
@@ -104,20 +112,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Manages authentication for agent circuits</summary>
         private AgentCircuitManager m_circuitManager;
         /// <summary>Reference to the scene this UDP server is attached to</summary>
-        private IScene m_scene;
+        private Scene m_scene;
         /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
         private Location m_location;
-        /// <summary>The measured resolution of Environment.TickCount</summary>
-        private float m_tickCountResolution;
         /// <summary>The size of the receive buffer for the UDP socket. This value
         /// is passed up to the operating system and used in the system networking
         /// stack. Use zero to leave this value as the default</summary>
         private int m_recvBufferSize;
         /// <summary>Flag to process packets asynchronously or synchronously</summary>
         private bool m_asyncPacketHandling;
+        /// <summary>Tracks whether or not a packet was sent each round so we know
+        /// whether or not to sleep</summary>
+        private bool m_packetSent;
+
+        /// <summary>Environment.TickCount of the last time the outgoing packet handler executed</summary>
+        private int m_tickLastOutgoingPacketHandler;
+        /// <summary>Keeps track of the number of elapsed milliseconds since the last time the outgoing packet handler looped</summary>
+        private int m_elapsedMSOutgoingPacketHandler;
+        /// <summary>Keeps track of the number of 100 millisecond periods elapsed in the outgoing packet handler executed</summary>
+        private int m_elapsed100MSOutgoingPacketHandler;
+        /// <summary>Keeps track of the number of 500 millisecond periods elapsed in the outgoing packet handler executed</summary>
+        private int m_elapsed500MSOutgoingPacketHandler;
+
+        /// <summary>Flag to signal when clients should check for resends</summary>
+        private bool m_resendUnacked;
+        /// <summary>Flag to signal when clients should send ACKs</summary>
+        private bool m_sendAcks;
+        /// <summary>Flag to signal when clients should send pings</summary>
+        private bool m_sendPing;
 
-        /// <summary>The measured resolution of Environment.TickCount</summary>
-        public float TickCountResolution { get { return m_tickCountResolution; } }
         public Socket Server { get { return null; } }
 
         public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager)
@@ -126,16 +149,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             #region Environment.TickCount Measurement
 
             // Measure the resolution of Environment.TickCount
-            m_tickCountResolution = 0f;
+            TickCountResolution = 0f;
             for (int i = 0; i < 5; i++)
             {
                 int start = Environment.TickCount;
                 int now = start;
                 while (now == start)
                     now = Environment.TickCount;
-                m_tickCountResolution += (float)(now - start) * 0.2f;
+                TickCountResolution += (float)(now - start) * 0.2f;
             }
             m_log.Info("[LLUDPSERVER]: Average Environment.TickCount resolution: " + TickCountResolution + "ms");
+            TickCountResolution = (float)Math.Ceiling(TickCountResolution);
 
             #endregion Environment.TickCount Measurement
 
@@ -181,15 +205,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void AddScene(IScene scene)
         {
-            if (m_scene == null)
+            if (m_scene != null)
             {
-                m_scene = scene;
-                m_location = new Location(m_scene.RegionInfo.RegionHandle);
+                m_log.Error("[LLUDPSERVER]: AddScene() called on an LLUDPServer that already has a scene");
+                return;
             }
-            else
+
+            if (!(scene is Scene))
             {
-                m_log.Error("[LLUDPSERVER]: AddScene() called on an LLUDPServer that already has a scene");
+                m_log.Error("[LLUDPSERVER]: AddScene() called with an unrecognized scene type " + scene.GetType());
+                return;
             }
+
+            m_scene = (Scene)scene;
+            m_location = new Location(m_scene.RegionInfo.RegionHandle);
         }
 
         public bool HandlesRegion(Location x)
@@ -267,38 +296,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             int dataLength = data.Length;
             bool doZerocode = (data[0] & Helpers.MSG_ZEROCODED) != 0;
+            bool doCopy = true;
 
             // Frequency analysis of outgoing packet sizes shows a large clump of packets at each end of the spectrum.
             // The vast majority of packets are less than 200 bytes, although due to asset transfers and packet splitting
             // there are a decent number of packets in the 1000-1140 byte range. We allocate one of two sizes of data here
             // to accomodate for both common scenarios and provide ample room for ACK appending in both
-            int bufferSize = (dataLength > 180) ? Packet.MTU : 200;
+            int bufferSize = (dataLength > 180) ? LLUDPServer.MTU : 200;
 
             UDPPacketBuffer buffer = new UDPPacketBuffer(udpClient.RemoteEndPoint, bufferSize);
 
             // Zerocode if needed
             if (doZerocode)
             {
-                try { dataLength = Helpers.ZeroEncode(data, dataLength, buffer.Data); }
+                try
+                {
+                    dataLength = Helpers.ZeroEncode(data, dataLength, buffer.Data);
+                    doCopy = false;
+                }
                 catch (IndexOutOfRangeException)
                 {
                     // The packet grew larger than the bufferSize while zerocoding.
                     // Remove the MSG_ZEROCODED flag and send the unencoded data
                     // instead
-                    m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". Removing MSG_ZEROCODED flag");
+                    m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". DataLength=" + dataLength +
+                        " and BufferLength=" + buffer.Data.Length + ". Removing MSG_ZEROCODED flag");
                     data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED);
-                    Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength);
                 }
             }
-            else
+
+            // If the packet data wasn't already copied during zerocoding, copy it now
+            if (doCopy)
             {
-                Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength);
+                if (dataLength <= buffer.Data.Length)
+                {
+                    Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength);
+                }
+                else
+                {
+                    m_log.Error("[LLUDPSERVER]: Packet exceeded buffer size! This could be an indication of packet assembly not obeying the MTU. Type=" +
+                        type + ", DataLength=" + dataLength + ", BufferLength=" + buffer.Data.Length + ". Dropping packet");
+                    return;
+                }
             }
+
             buffer.DataLength = dataLength;
 
             #region Queue or Send
 
-            // Look up the UDPClient this is going to
             OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category);
 
             if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket))
@@ -338,57 +383,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             StartPingCheckPacket pc = (StartPingCheckPacket)PacketPool.Instance.GetPacket(PacketType.StartPingCheck);
             pc.Header.Reliable = false;
 
-            OutgoingPacket oldestPacket = udpClient.NeedAcks.GetOldest();
-
             pc.PingID.PingID = (byte)udpClient.CurrentPingSequence++;
-            pc.PingID.OldestUnacked = (oldestPacket != null) ? oldestPacket.SequenceNumber : 0;
+            // We *could* get OldestUnacked, but it would hurt performance and not provide any benefit
+            pc.PingID.OldestUnacked = 0;
 
             SendPacket(udpClient, pc, ThrottleOutPacketType.Unknown, false);
         }
 
         public void ResendUnacked(LLUDPClient udpClient)
         {
-            if (udpClient.IsConnected && udpClient.NeedAcks.Count > 0)
+            if (!udpClient.IsConnected)
+                return;
+
+            // Disconnect an agent if no packets are received for some time
+            //FIXME: Make 60 an .ini setting
+            if ((Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > 1000 * 60)
             {
-                // Disconnect an agent if no packets are received for some time
-                //FIXME: Make 60 an .ini setting
-                if (Environment.TickCount - udpClient.TickLastPacketReceived > 1000 * 60)
-                {
-                    m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID);
+                m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID);
 
-                    RemoveClient(udpClient);
-                    return;
-                }
+                RemoveClient(udpClient);
+                return;
+            }
 
-                // Get a list of all of the packets that have been sitting unacked longer than udpClient.RTO
-                List<OutgoingPacket> expiredPackets = udpClient.NeedAcks.GetExpiredPackets(udpClient.RTO);
+            // Get a list of all of the packets that have been sitting unacked longer than udpClient.RTO
+            List<OutgoingPacket> expiredPackets = udpClient.NeedAcks.GetExpiredPackets(udpClient.RTO);
 
-                if (expiredPackets != null)
-                {
-                    // Resend packets
-                    for (int i = 0; i < expiredPackets.Count; i++)
-                    {
-                        OutgoingPacket outgoingPacket = expiredPackets[i];
+            if (expiredPackets != null)
+            {
+                m_log.Debug("[LLUDPSERVER]: Resending " + expiredPackets.Count + " packets to " + udpClient.AgentID + ", RTO=" + udpClient.RTO);
 
-                        //m_log.DebugFormat("[LLUDPSERVER]: Resending packet #{0} (attempt {1}), {2}ms have passed",
-                        //    outgoingPacket.SequenceNumber, outgoingPacket.ResendCount, Environment.TickCount - outgoingPacket.TickCount);
+                // Resend packets
+                for (int i = 0; i < expiredPackets.Count; i++)
+                {
+                    OutgoingPacket outgoingPacket = expiredPackets[i];
 
-                        // Set the resent flag
-                        outgoingPacket.Buffer.Data[0] = (byte)(outgoingPacket.Buffer.Data[0] | Helpers.MSG_RESENT);
-                        outgoingPacket.Category = ThrottleOutPacketType.Resend;
+                    //m_log.DebugFormat("[LLUDPSERVER]: Resending packet #{0} (attempt {1}), {2}ms have passed",
+                    //    outgoingPacket.SequenceNumber, outgoingPacket.ResendCount, Environment.TickCount - outgoingPacket.TickCount);
 
-                        // The TickCount will be set to the current time when the packet
-                        // is actually sent out again
-                        outgoingPacket.TickCount = 0;
+                    // Set the resent flag
+                    outgoingPacket.Buffer.Data[0] = (byte)(outgoingPacket.Buffer.Data[0] | Helpers.MSG_RESENT);
+                    outgoingPacket.Category = ThrottleOutPacketType.Resend;
 
-                        // Bump up the resend count on this packet
-                        Interlocked.Increment(ref outgoingPacket.ResendCount);
-                        //Interlocked.Increment(ref Stats.ResentPackets);
+                    // Bump up the resend count on this packet
+                    Interlocked.Increment(ref outgoingPacket.ResendCount);
+                    //Interlocked.Increment(ref Stats.ResentPackets);
 
-                        // Requeue or resend the packet
-                        if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket))
-                            SendPacketFinal(outgoingPacket);
-                    }
+                    // Requeue or resend the packet
+                    if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket))
+                        SendPacketFinal(outgoingPacket);
                 }
             }
         }
@@ -409,9 +451,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!udpClient.IsConnected)
                 return;
 
-            // Keep track of when this packet was sent out (right now)
-            outgoingPacket.TickCount = Environment.TickCount;
-
             #region ACK Appending
 
             int dataLength = buffer.DataLength;
@@ -464,6 +503,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Put the UDP payload on the wire
             AsyncBeginSend(buffer);
+
+            // Keep track of when this packet was sent out (right now)
+            outgoingPacket.TickCount = Environment.TickCount & Int32.MaxValue;
         }
 
         protected override void PacketReceived(UDPPacketBuffer buffer)
@@ -506,14 +548,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // UseCircuitCode handling
             if (packet.Type == PacketType.UseCircuitCode)
             {
-                AddNewClient((UseCircuitCodePacket)packet, (IPEndPoint)buffer.RemoteEndPoint);
+                Util.FireAndForget(
+                    delegate(object o)
+                    {
+                        IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint;
+
+                        // Begin the process of adding the client to the simulator
+                        AddNewClient((UseCircuitCodePacket)packet, remoteEndPoint);
+
+                        // Acknowledge the UseCircuitCode packet
+                        SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
+                    }
+                );
+                return;
             }
 
             // Determine which agent this packet came from
             IClientAPI client;
             if (!m_scene.ClientManager.TryGetValue(address, out client) || !(client is LLClientView))
             {
-                m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address +
+                m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address +
                     " in " + m_scene.RegionInfo.RegionName + ", currently tracking " + m_scene.ClientManager.Count + " clients");
                 return;
             }
@@ -528,19 +582,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Stats tracking
             Interlocked.Increment(ref udpClient.PacketsReceived);
 
-            #region ACK Receiving
-
-            int now = Environment.TickCount;
+            int now = Environment.TickCount & Int32.MaxValue;
             udpClient.TickLastPacketReceived = now;
 
+            #region ACK Receiving
+
             // Handle appended ACKs
             if (packet.Header.AppendedAcks && packet.Header.AckList != null)
             {
-                lock (udpClient.NeedAcks.SyncRoot)
-                {
-                    for (int i = 0; i < packet.Header.AckList.Length; i++)
-                        AcknowledgePacket(udpClient, packet.Header.AckList[i], now, packet.Header.Resent);
-                }
+                for (int i = 0; i < packet.Header.AckList.Length; i++)
+                    udpClient.NeedAcks.Remove(packet.Header.AckList[i], now, packet.Header.Resent);
             }
 
             // Handle PacketAck packets
@@ -548,11 +599,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 PacketAckPacket ackPacket = (PacketAckPacket)packet;
 
-                lock (udpClient.NeedAcks.SyncRoot)
-                {
-                    for (int i = 0; i < ackPacket.Packets.Length; i++)
-                        AcknowledgePacket(udpClient, ackPacket.Packets[i].ID, now, packet.Header.Resent);
-                }
+                for (int i = 0; i < ackPacket.Packets.Length; i++)
+                    udpClient.NeedAcks.Remove(ackPacket.Packets[i].ID, now, packet.Header.Resent);
+
+                // We don't need to do anything else with PacketAck packets
+                return;
             }
 
             #endregion ACK Receiving
@@ -560,20 +611,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             #region ACK Sending
 
             if (packet.Header.Reliable)
+            {
                 udpClient.PendingAcks.Enqueue(packet.Header.Sequence);
 
-            // This is a somewhat odd sequence of steps to pull the client.BytesSinceLastACK value out,
-            // add the current received bytes to it, test if 2*MTU bytes have been sent, if so remove
-            // 2*MTU bytes from the value and send ACKs, and finally add the local value back to
-            // client.BytesSinceLastACK. Lockless thread safety
-            int bytesSinceLastACK = Interlocked.Exchange(ref udpClient.BytesSinceLastACK, 0);
-            bytesSinceLastACK += buffer.DataLength;
-            if (bytesSinceLastACK > Packet.MTU * 2)
-            {
-                bytesSinceLastACK -= Packet.MTU * 2;
-                SendAcks(udpClient);
+                // This is a somewhat odd sequence of steps to pull the client.BytesSinceLastACK value out,
+                // add the current received bytes to it, test if 2*MTU bytes have been sent, if so remove
+                // 2*MTU bytes from the value and send ACKs, and finally add the local value back to
+                // client.BytesSinceLastACK. Lockless thread safety
+                int bytesSinceLastACK = Interlocked.Exchange(ref udpClient.BytesSinceLastACK, 0);
+                bytesSinceLastACK += buffer.DataLength;
+                if (bytesSinceLastACK > LLUDPServer.MTU * 2)
+                {
+                    bytesSinceLastACK -= LLUDPServer.MTU * 2;
+                    SendAcks(udpClient);
+                }
+                Interlocked.Add(ref udpClient.BytesSinceLastACK, bytesSinceLastACK);
             }
-            Interlocked.Add(ref udpClient.BytesSinceLastACK, bytesSinceLastACK);
 
             #endregion ACK Sending
 
@@ -593,16 +646,47 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #endregion Incoming Packet Accounting
 
-            // Don't bother clogging up the queue with PacketAck packets that are already handled here
-            if (packet.Type != PacketType.PacketAck)
+            #region Ping Check Handling
+
+            if (packet.Type == PacketType.StartPingCheck)
             {
-                // Inbox insertion
-                packetInbox.Enqueue(new IncomingPacket(udpClient, packet));
+                // We don't need to do anything else with ping checks
+                StartPingCheckPacket startPing = (StartPingCheckPacket)packet;
+
+                CompletePingCheckPacket completePing = new CompletePingCheckPacket();
+                completePing.PingID.PingID = startPing.PingID.PingID;
+                SendPacket(udpClient, completePing, ThrottleOutPacketType.Unknown, false);
+                return;
             }
+            else if (packet.Type == PacketType.CompletePingCheck)
+            {
+                // We don't currently track client ping times
+                return;
+            }
+
+            #endregion Ping Check Handling
+
+            // Inbox insertion
+            packetInbox.Enqueue(new IncomingPacket(udpClient, packet));
         }
 
-        protected override void PacketSent(UDPPacketBuffer buffer, int bytesSent)
+        private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
         {
+            PacketAckPacket ack = new PacketAckPacket();
+            ack.Header.Reliable = false;
+            ack.Packets = new PacketAckPacket.PacketsBlock[1];
+            ack.Packets[0] = new PacketAckPacket.PacketsBlock();
+            ack.Packets[0].ID = sequenceNumber;
+
+            byte[] packetData = ack.ToBytes();
+            int length = packetData.Length;
+
+            UDPPacketBuffer buffer = new UDPPacketBuffer(remoteEndpoint, length);
+            buffer.DataLength = length;
+
+            Buffer.BlockCopy(packetData, 0, buffer.Data, 0, length);
+
+            AsyncBeginSend(buffer);
         }
 
         private bool IsClientAuthorized(UseCircuitCodePacket useCircuitCode, out AuthenticateResponse sessionInfo)
@@ -672,33 +756,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 client.Close();
         }
 
-        private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend)
-        {
-            OutgoingPacket ackedPacket;
-            if (client.NeedAcks.RemoveUnsafe(ack, out ackedPacket) && !fromResend)
-            {
-                // Update stats
-                Interlocked.Add(ref client.UnackedBytes, -ackedPacket.Buffer.DataLength);
-
-                // Calculate the round-trip time for this packet and its ACK
-                int rtt = currentTime - ackedPacket.TickCount;
-                if (rtt > 0)
-                    client.UpdateRoundTrip(rtt);
-            }
-        }
-
         private void IncomingPacketHandler()
         {
             // Set this culture for the thread that incoming packets are received
             // on to en-US to avoid number parsing issues
             Culture.SetCurrentCulture();
 
-            IncomingPacket incomingPacket = null;
-
             while (base.IsRunning)
             {
-                if (packetInbox.Dequeue(100, ref incomingPacket))
-                    Util.FireAndForget(ProcessInPacket, incomingPacket);
+                try
+                {
+                    IncomingPacket incomingPacket = null;
+
+                    if (packetInbox.Dequeue(100, ref incomingPacket))
+                        Util.FireAndForget(ProcessInPacket, incomingPacket);
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex);
+                }
             }
 
             if (packetInbox.Count > 0)
@@ -712,68 +788,97 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // on to en-US to avoid number parsing issues
             Culture.SetCurrentCulture();
 
-            int now = Environment.TickCount;
-            int elapsedMS = 0;
-            int elapsed100MS = 0;
-            int elapsed500MS = 0;
-
             while (base.IsRunning)
             {
-                bool resendUnacked = false;
-                bool sendAcks = false;
-                bool sendPings = false;
-                bool packetSent = false;
+                try
+                {
+                    m_packetSent = false;
 
-                elapsedMS += Environment.TickCount - now;
+                    #region Update Timers
 
-                // Check for pending outgoing resends every 100ms
-                if (elapsedMS >= 100)
-                {
-                    resendUnacked = true;
-                    elapsedMS -= 100;
-                    ++elapsed100MS;
+                    m_resendUnacked = false;
+                    m_sendAcks = false;
+                    m_sendPing = false;
+
+                    // Update elapsed time
+                    int thisTick = Environment.TickCount & Int32.MaxValue;
+                    if (m_tickLastOutgoingPacketHandler > thisTick)
+                        m_elapsedMSOutgoingPacketHandler += ((Int32.MaxValue - m_tickLastOutgoingPacketHandler) + thisTick);
+                    else
+                        m_elapsedMSOutgoingPacketHandler += (thisTick - m_tickLastOutgoingPacketHandler);
+
+                    m_tickLastOutgoingPacketHandler = thisTick;
+
+                    // Check for pending outgoing resends every 100ms
+                    if (m_elapsedMSOutgoingPacketHandler >= 100)
+                    {
+                        m_resendUnacked = true;
+                        m_elapsedMSOutgoingPacketHandler = 0;
+                        m_elapsed100MSOutgoingPacketHandler += 1;
+                    }
+
+                    // Check for pending outgoing ACKs every 500ms
+                    if (m_elapsed100MSOutgoingPacketHandler >= 5)
+                    {
+                        m_sendAcks = true;
+                        m_elapsed100MSOutgoingPacketHandler = 0;
+                        m_elapsed500MSOutgoingPacketHandler += 1;
+                    }
+
+                    // Send pings to clients every 5000ms
+                    if (m_elapsed500MSOutgoingPacketHandler >= 10)
+                    {
+                        m_sendPing = true;
+                        m_elapsed500MSOutgoingPacketHandler = 0;
+                    }
+
+                    #endregion Update Timers
+
+                    // Handle outgoing packets, resends, acknowledgements, and pings for each
+                    // client. m_packetSent will be set to true if a packet is sent
+                    m_scene.ClientManager.ForEachSync(ClientOutgoingPacketHandler);
+
+                    // If nothing was sent, sleep for the minimum amount of time before a
+                    // token bucket could get more tokens
+                    if (!m_packetSent)
+                        Thread.Sleep((int)TickCountResolution);
                 }
-                // Check for pending outgoing ACKs every 500ms
-                if (elapsed100MS >= 5)
+                catch (Exception ex)
                 {
-                    sendAcks = true;
-                    elapsed100MS = 0;
-                    ++elapsed500MS;
+                    m_log.Error("[LLUDPSERVER]: OutgoingPacketHandler loop threw an exception: " + ex.Message, ex);
                 }
-                // Send pings to clients every 5000ms
-                if (elapsed500MS >= 10)
+            }
+        }
+
+        private void ClientOutgoingPacketHandler(IClientAPI client)
+        {
+            try
+            {
+                if (client is LLClientView)
                 {
-                    sendPings = true;
-                    elapsed500MS = 0;
-                }
+                    LLUDPClient udpClient = ((LLClientView)client).UDPClient;
 
-                m_scene.ClientManager.ForEach(
-                    delegate(IClientAPI client)
+                    if (udpClient.IsConnected)
                     {
-                        if (client is LLClientView)
-                        {
-                            LLUDPClient udpClient = ((LLClientView)client).UDPClient;
-
-                            if (udpClient.IsConnected)
-                            {
-                                if (udpClient.DequeueOutgoing())
-                                    packetSent = true;
-                                if (resendUnacked)
-                                    ResendUnacked(udpClient);
-                                if (sendAcks)
-                                {
-                                    SendAcks(udpClient);
-                                    udpClient.SendPacketStats();
-                                }
-                                if (sendPings)
-                                    SendPing(udpClient);
-                            }
-                        }
-                    }
-                );
+                        if (m_resendUnacked)
+                            ResendUnacked(udpClient);
+
+                        if (m_sendAcks)
+                            SendAcks(udpClient);
+
+                        if (m_sendPing)
+                            SendPing(udpClient);
 
-                if (!packetSent)
-                    Thread.Sleep(20);
+                        // Dequeue any outgoing packets that are within the throttle limits
+                        if (udpClient.DequeueOutgoing())
+                            m_packetSent = true;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                m_log.Error("[LLUDPSERVER]: OutgoingPacketHandler iteration for " + client.Name +
+                    " threw an exception: " + ex.Message, ex);
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs
index d16837d..552cc4a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs
@@ -45,13 +45,6 @@ namespace OpenMetaverse
         /// </summary>
         /// <param name="buffer">Incoming packet buffer</param>
         protected abstract void PacketReceived(UDPPacketBuffer buffer);
-        
-        /// <summary>
-        /// This method is called when an outgoing packet is sent
-        /// </summary>
-        /// <param name="buffer">Outgoing packet buffer</param>
-        /// <param name="bytesSent">Number of bytes written to the wire</param>
-        protected abstract void PacketSent(UDPPacketBuffer buffer, int bytesSent);
 
         /// <summary>UDP port to bind to in server mode</summary>
         protected int m_udpPort;
@@ -279,8 +272,6 @@ namespace OpenMetaverse
             {
                 UDPPacketBuffer buf = (UDPPacketBuffer)result.AsyncState;
                 int bytesSent = m_udpSocket.EndSendTo(result);
-
-                PacketSent(buf, bytesSent);
             }
             catch (SocketException) { }
             catch (ObjectDisposedException) { }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
new file mode 100644
index 0000000..bdbd284
--- /dev/null
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 OpenSim.Region.ClientStack.LindenUDP
+{
+    /// <summary>
+    /// A hierarchical token bucket for bandwidth throttling. See
+    /// http://en.wikipedia.org/wiki/Token_bucket for more information
+    /// </summary>
+    public class TokenBucket
+    {
+        /// <summary>Parent bucket to this bucket, or null if this is a root
+        /// bucket</summary>
+        TokenBucket parent;
+        /// <summary>Size of the bucket in bytes. If zero, the bucket has 
+        /// infinite capacity</summary>
+        int maxBurst;
+        /// <summary>Rate that the bucket fills, in bytes per millisecond. If
+        /// zero, the bucket always remains full</summary>
+        int tokensPerMS;
+        /// <summary>Number of tokens currently in the bucket</summary>
+        int content;
+        /// <summary>Time of the last drip, in system ticks</summary>
+        int lastDrip;
+
+        #region Properties
+
+        /// <summary>
+        /// The parent bucket of this bucket, or null if this bucket has no
+        /// parent. The parent bucket will limit the aggregate bandwidth of all
+        /// of its children buckets
+        /// </summary>
+        public TokenBucket Parent
+        {
+            get { return parent; }
+        }
+
+        /// <summary>
+        /// Maximum burst rate in bytes per second. This is the maximum number
+        /// of tokens that can accumulate in the bucket at any one time
+        /// </summary>
+        public int MaxBurst
+        {
+            get { return maxBurst; }
+            set { maxBurst = (value >= 0 ? value : 0); }
+        }
+
+        /// <summary>
+        /// The speed limit of this bucket in bytes per second. This is the
+        /// number of tokens that are added to the bucket per second
+        /// </summary>
+        /// <remarks>Tokens are added to the bucket any time 
+        /// <seealso cref="RemoveTokens"/> is called, at the granularity of
+        /// the system tick interval (typically around 15-22ms)</remarks>
+        public int DripRate
+        {
+            get { return tokensPerMS * 1000; }
+            set
+            {
+                if (value == 0)
+                    tokensPerMS = 0;
+                else
+                {
+                    int bpms = (int)((float)value / 1000.0f);
+
+                    if (bpms <= 0)
+                        tokensPerMS = 1; // 1 byte/ms is the minimum granularity
+                    else
+                        tokensPerMS = bpms;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The speed limit of this bucket in bytes per millisecond
+        /// </summary>
+        public int DripPerMS
+        {
+            get { return tokensPerMS; }
+        }
+
+        /// <summary>
+        /// The number of bytes that can be sent at this moment. This is the
+        /// current number of tokens in the bucket
+        /// <remarks>If this bucket has a parent bucket that does not have
+        /// enough tokens for a request, <seealso cref="RemoveTokens"/> will 
+        /// return false regardless of the content of this bucket</remarks>
+        /// </summary>
+        public int Content
+        {
+            get { return content; }
+        }
+
+        #endregion Properties
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="parent">Parent bucket if this is a child bucket, or
+        /// null if this is a root bucket</param>
+        /// <param name="maxBurst">Maximum size of the bucket in bytes, or
+        /// zero if this bucket has no maximum capacity</param>
+        /// <param name="dripRate">Rate that the bucket fills, in bytes per
+        /// second. If zero, the bucket always remains full</param>
+        public TokenBucket(TokenBucket parent, int maxBurst, int dripRate)
+        {
+            this.parent = parent;
+            MaxBurst = maxBurst;
+            DripRate = dripRate;
+            lastDrip = Environment.TickCount & Int32.MaxValue;
+        }
+
+        /// <summary>
+        /// Remove a given number of tokens from the bucket
+        /// </summary>
+        /// <param name="amount">Number of tokens to remove from the bucket</param>
+        /// <returns>True if the requested number of tokens were removed from
+        /// the bucket, otherwise false</returns>
+        public bool RemoveTokens(int amount)
+        {
+            bool dummy;
+            return RemoveTokens(amount, out dummy);
+        }
+
+        /// <summary>
+        /// Remove a given number of tokens from the bucket
+        /// </summary>
+        /// <param name="amount">Number of tokens to remove from the bucket</param>
+        /// <param name="dripSucceeded">True if tokens were added to the bucket
+        /// during this call, otherwise false</param>
+        /// <returns>True if the requested number of tokens were removed from
+        /// the bucket, otherwise false</returns>
+        public bool RemoveTokens(int amount, out bool dripSucceeded)
+        {
+            if (maxBurst == 0)
+            {
+                dripSucceeded = true;
+                return true;
+            }
+
+            dripSucceeded = Drip();
+
+            if (content - amount >= 0)
+            {
+                if (parent != null && !parent.RemoveTokens(amount))
+                    return false;
+
+                content -= amount;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Add tokens to the bucket over time. The number of tokens added each
+        /// call depends on the length of time that has passed since the last 
+        /// call to Drip
+        /// </summary>
+        /// <returns>True if tokens were added to the bucket, otherwise false</returns>
+        public bool Drip()
+        {
+            if (tokensPerMS == 0)
+            {
+                content = maxBurst;
+                return true;
+            }
+            else
+            {
+                int now = Environment.TickCount & Int32.MaxValue;
+                int deltaMS = now - lastDrip;
+
+                if (deltaMS <= 0)
+                {
+                    if (deltaMS < 0)
+                        lastDrip = now;
+                    return false;
+                }
+
+                int dripAmount = deltaMS * tokensPerMS;
+
+                content = Math.Min(content + dripAmount, maxBurst);
+                lastDrip = now;
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index f3242c1..e43f7cf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -37,97 +37,59 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// </summary>
     public sealed class UnackedPacketCollection
     {
-        /// <summary>Synchronization primitive. A lock must be acquired on this
-        /// object before calling any of the unsafe methods</summary>
-        public object SyncRoot = new object();
-
-        /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary>
-        private SortedDictionary<uint, OutgoingPacket> packets = new SortedDictionary<uint, OutgoingPacket>();
-
-        /// <summary>Gets the total number of unacked packets</summary>
-        public int Count { get { return packets.Count; } }
-
         /// <summary>
-        /// Default constructor
+        /// Holds information about a pending acknowledgement
         /// </summary>
-        public UnackedPacketCollection()
+        private struct PendingAck
         {
-        }
+            /// <summary>Sequence number of the packet to remove</summary>
+            public uint SequenceNumber;
+            /// <summary>Environment.TickCount value when the remove was queued.
+            /// This is used to update round-trip times for packets</summary>
+            public int RemoveTime;
+            /// <summary>Whether or not this acknowledgement was attached to a
+            /// resent packet. If so, round-trip time will not be calculated</summary>
+            public bool FromResend;
 
-        /// <summary>
-        /// Add an unacked packet to the collection
-        /// </summary>
-        /// <param name="packet">Packet that is awaiting acknowledgement</param>
-        /// <returns>True if the packet was successfully added, false if the
-        /// packet already existed in the collection</returns>
-        public bool Add(OutgoingPacket packet)
-        {
-            lock (SyncRoot)
+            public PendingAck(uint sequenceNumber, int currentTime, bool fromResend)
             {
-                if (!packets.ContainsKey(packet.SequenceNumber))
-                {
-                    packets.Add(packet.SequenceNumber, packet);
-                    return true;
-                }
-                return false;
+                SequenceNumber = sequenceNumber;
+                RemoveTime = currentTime;
+                FromResend = fromResend;
             }
         }
 
-        /// <summary>
-        /// Removes a packet from the collection without attempting to obtain a
-        /// lock first
-        /// </summary>
-        /// <param name="sequenceNumber">Sequence number of the packet to remove</param>
-        /// <returns>True if the packet was found and removed, otherwise false</returns>
-        public bool RemoveUnsafe(uint sequenceNumber)
-        {
-            return packets.Remove(sequenceNumber);
-        }
-
-        /// <summary>
-        /// Removes a packet from the collection without attempting to obtain a
-        /// lock first
-        /// </summary>
-        /// <param name="sequenceNumber">Sequence number of the packet to remove</param>
-        /// <param name="packet">Returns the removed packet</param>
-        /// <returns>True if the packet was found and removed, otherwise false</returns>
-        public bool RemoveUnsafe(uint sequenceNumber, out OutgoingPacket packet)
-        {
-            if (packets.TryGetValue(sequenceNumber, out packet))
-            {
-                packets.Remove(sequenceNumber);
-                return true;
-            }
-
-            return false;
-        }
+        /// <summary>Holds the actual unacked packet data, sorted by sequence number</summary>
+        private Dictionary<uint, OutgoingPacket> m_packets = new Dictionary<uint, OutgoingPacket>();
+        /// <summary>Holds packets that need to be added to the unacknowledged list</summary>
+        private LocklessQueue<OutgoingPacket> m_pendingAdds = new LocklessQueue<OutgoingPacket>();
+        /// <summary>Holds information about pending acknowledgements</summary>
+        private LocklessQueue<PendingAck> m_pendingRemoves = new LocklessQueue<PendingAck>();
 
         /// <summary>
-        /// Removes all elements from the collection
+        /// Add an unacked packet to the collection
         /// </summary>
-        public void Clear()
+        /// <param name="packet">Packet that is awaiting acknowledgement</param>
+        /// <returns>True if the packet was successfully added, false if the
+        /// packet already existed in the collection</returns>
+        /// <remarks>This does not immediately add the ACK to the collection,
+        /// it only queues it so it can be added in a thread-safe way later</remarks>
+        public void Add(OutgoingPacket packet)
         {
-            lock (SyncRoot)
-                packets.Clear();
+            m_pendingAdds.Enqueue(packet);
         }
 
         /// <summary>
-        /// Gets the packet with the lowest sequence number
+        /// Marks a packet as acknowledged
         /// </summary>
-        /// <returns>The packet with the lowest sequence number, or null if the
-        /// collection is empty</returns>
-        public OutgoingPacket GetOldest()
+        /// <param name="sequenceNumber">Sequence number of the packet to
+        /// acknowledge</param>
+        /// <param name="currentTime">Current value of Environment.TickCount</param>
+        /// <remarks>This does not immediately acknowledge the packet, it only
+        /// queues the ack so it can be handled in a thread-safe way later</remarks>
+        public void Remove(uint sequenceNumber, int currentTime, bool fromResend)
         {
-            lock (SyncRoot)
-            {
-                using (SortedDictionary<uint, OutgoingPacket>.ValueCollection.Enumerator e = packets.Values.GetEnumerator())
-                {
-                    if (e.MoveNext())
-                        return e.Current;
-                    else
-                        return null;
-                }
-            }
+            m_pendingRemoves.Enqueue(new PendingAck(sequenceNumber, currentTime, fromResend));
         }
 
         /// <summary>
@@ -138,15 +100,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// packet is considered expired</param>
         /// <returns>A list of all expired packets according to the given
         /// expiration timeout</returns>
+        /// <remarks>This function is not thread safe, and cannot be called
+        /// multiple times concurrently</remarks>
         public List<OutgoingPacket> GetExpiredPackets(int timeoutMS)
         {
+            ProcessQueues();
+
             List<OutgoingPacket> expiredPackets = null;
 
-            lock (SyncRoot)
+            if (m_packets.Count > 0)
             {
-                int now = Environment.TickCount;
-                foreach (OutgoingPacket packet in packets.Values)
+                int now = Environment.TickCount & Int32.MaxValue;
+
+                foreach (OutgoingPacket packet in m_packets.Values)
                 {
+                    // TickCount of zero means a packet is in the resend queue 
+                    // but hasn't actually been sent over the wire yet
                     if (packet.TickCount == 0)
                         continue;
 
@@ -154,16 +123,47 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         if (expiredPackets == null)
                             expiredPackets = new List<OutgoingPacket>();
+
+                        // The TickCount will be set to the current time when the packet
+                        // is actually sent out again
+                        packet.TickCount = 0;
+
                         expiredPackets.Add(packet);
                     }
-                    else
-                    {
-                        break;
-                    }
                 }
             }
 
             return expiredPackets;
         }
+
+        private void ProcessQueues()
+        {
+            // Process all the pending adds
+            OutgoingPacket pendingAdd;
+            while (m_pendingAdds.Dequeue(out pendingAdd))
+                m_packets[pendingAdd.SequenceNumber] = pendingAdd;
+
+            // Process all the pending removes, including updating statistics and round-trip times
+            PendingAck pendingRemove;
+            OutgoingPacket ackedPacket;
+            while (m_pendingRemoves.Dequeue(out pendingRemove))
+            {
+                if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
+                {
+                    m_packets.Remove(pendingRemove.SequenceNumber);
+
+                    // Update stats
+                    System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
+
+                    if (!pendingRemove.FromResend)
+                    {
+                        // Calculate the round-trip time for this packet and its ACK
+                        int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
+                        if (rtt > 0)
+                            ackedPacket.Client.UpdateRoundTrip(rtt);
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/ClientStack/ThrottleSettings.cs b/OpenSim/Region/ClientStack/ThrottleSettings.cs
deleted file mode 100644
index fe4718c..0000000
--- a/OpenSim/Region/ClientStack/ThrottleSettings.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.
- */
-
-namespace OpenSim.Region.ClientStack
-{
-    /// <summary>
-    /// Represent throttle settings for a client stack.  These settings are in bytes per second
-    /// </summary> 
-    public class ThrottleSettings
-    {
-        /// <summary>
-        /// Minimum bytes per second that the throttle can be set to.
-        /// </summary>
-        public int Min;
-        
-        /// <summary>
-        /// Maximum bytes per second that the throttle can be set to.
-        /// </summary>
-        public int Max;
-        
-        /// <summary>
-        /// Current bytes per second that the throttle should be set to.
-        /// </summary>
-        public int Current;
-              
-        public ThrottleSettings(int min, int max, int current)
-        {
-            Min = min;
-            Max = max;
-            Current = current;
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
deleted file mode 100644
index efa275c..0000000
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
-
-namespace OpenSim.Region.CoreModules.Agent.TextureSender
-{
-    [TestFixture]
-    public class UserTextureSenderTests
-    {
-        public UUID uuid1;
-        public UUID uuid2;
-        public UUID uuid3;
-        public UUID uuid4;
-        public int npackets, testsize;
-        public TestClient client;
-        public TextureSender ts;
-        public static Random random = new Random();
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = UUID.Random();
-            agent.firstname = "testfirstname";
-            agent.lastname = "testlastname";
-            agent.SessionID = UUID.Zero;
-            agent.SecureSessionID = UUID.Zero;
-            agent.circuitcode = 123;
-            agent.BaseFolder = UUID.Zero;
-            agent.InventoryFolder = UUID.Zero;
-            agent.startpos = Vector3.Zero;
-            agent.CapsPath = "http://wibble.com";
-            client = new TestClient(agent, null);
-            ts = new TextureSender(client, 0, 0);
-            testsize = random.Next(5000,15000);
-            npackets = CalculateNumPackets(testsize);
-            uuid1 = UUID.Random();
-            uuid2 = UUID.Random();
-            uuid3 = UUID.Random();
-            uuid4 = UUID.Random();
-        }
-
-        /// <summary>
-        /// Test sending package
-        /// </summary>
-        [Test]
-        public void T010_SendPkg()
-        {
-            TestHelper.InMethod();
-            // Normal sending
-            AssetBase abase = new AssetBase(uuid1, "asset one");
-            byte[] abdata = new byte[testsize];
-            random.NextBytes(abdata);
-            abase.Data = abdata;
-            bool isdone = false;
-            ts.TextureReceived(abase);
-            for (int i = 0; i < npackets; i++) {
-                isdone = ts.SendTexturePacket();
-            }
-
-            Assert.That(isdone,Is.False);
-            isdone = ts.SendTexturePacket();
-            Assert.That(isdone,Is.True);
-        }
-
-        [Test]
-        public void T011_UpdateReq()
-        {
-            TestHelper.InMethod();
-            // Test packet number start
-            AssetBase abase = new AssetBase(uuid2, "asset two");
-            byte[] abdata = new byte[testsize];
-            random.NextBytes(abdata);
-            abase.Data = abdata;
-
-            bool isdone = false;
-            ts.TextureReceived(abase);
-            ts.UpdateRequest(0,3);
-
-            for (int i = 0; i < npackets-3; i++) {
-                isdone = ts.SendTexturePacket();
-            }
-
-            Assert.That(isdone,Is.False);
-            isdone = ts.SendTexturePacket();
-            Assert.That(isdone,Is.True);
-
-            // Test discard level
-            abase = new AssetBase(uuid3, "asset three");
-            abdata = new byte[testsize];
-            random.NextBytes(abdata);
-            abase.Data = abdata;
-            isdone = false;
-            ts.TextureReceived(abase);
-            ts.UpdateRequest(-1,0);
-
-            Assert.That(ts.SendTexturePacket(),Is.True);
-
-            abase = new AssetBase(uuid4, "asset four");
-            abdata = new byte[testsize];
-            random.NextBytes(abdata);
-            abase.Data = abdata;
-            isdone = false;
-            ts.TextureReceived(abase);
-            ts.UpdateRequest(0,5);
-
-            for (int i = 0; i < npackets-5; i++) {
-                isdone = ts.SendTexturePacket();
-            }
-            Assert.That(isdone,Is.False);
-            isdone = ts.SendTexturePacket();
-            Assert.That(isdone,Is.True);
-        }
-
-        [Test]
-        public void T999_FinishStatus()
-        {
-            TestHelper.InMethod();
-            // Of the 4 assets "sent", only 2 sent the first part.
-            Assert.That(client.sentdatapkt.Count,Is.EqualTo(2));
-
-            // Sum of all packets sent:
-            int totalpkts = (npackets) + (npackets - 2) + (npackets - 4);
-            Assert.That(client.sentpktpkt.Count,Is.EqualTo(totalpkts));
-        }
-        
-        /// <summary>
-        /// Calculate the number of packets that will be required to send the texture loaded into this sender
-        /// This is actually the number of 1000 byte packets not including an initial 600 byte packet...
-        /// Borrowed from TextureSender.cs
-        /// </summary>
-        /// <param name="length"></param>
-        /// <returns></returns>
-        private int CalculateNumPackets(int length)
-        {
-            int numPackets = 0;
-
-            if (length > 600)
-            {
-                //over 600 bytes so split up file
-                int restData = (length - 600);
-                int restPackets = ((restData + 999) / 1000);
-                numPackets = restPackets;
-            }
-
-            return numPackets;
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 66ca7c2..1add0ab 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -155,14 +155,6 @@ namespace OpenSim.Region.CoreModules.Asset
         private int m_hitCount;
 
         /// <summary>
-        /// Initialize asset cache module with default parameters.
-        /// </summary>
-        public void Initialize()
-        {
-            Initialize(DefaultMaxSize, DefaultMaxCount, DefaultExpirationTime);
-        }
-
-        /// <summary>
         /// Initialize asset cache module, with custom parameters.
         /// </summary>
         /// <param name="maximalSize">
@@ -174,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Asset
         /// <param name="expirationTime">
         /// Asset's expiration time.
         /// </param>
-        public void Initialize(long maximalSize, int maximalCount, TimeSpan expirationTime)
+        protected void Initialize(long maximalSize, int maximalCount, TimeSpan expirationTime)
         {
             if (maximalSize <= 0 || maximalCount <= 0)
             {
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 0a7e736..7da5e7a 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -44,10 +44,8 @@ namespace OpenSim.Region.CoreModules.Asset
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
-        private Cache m_Cache = new Cache(CacheMedium.Memory,
-                                          CacheStrategy.Aggressive,
-                                          CacheFlags.AllowUpdate);
+        private bool m_Enabled;
+        private Cache m_Cache;
 
         public string Name
         {
@@ -77,6 +75,7 @@ namespace OpenSim.Region.CoreModules.Asset
                         return;
                     }
 
+                    m_Cache = new Cache(CacheMedium.Memory, CacheStrategy.Aggressive, CacheFlags.AllowUpdate);
                     m_Enabled = true;
 
                     m_log.Info("[ASSET CACHE]: Core asset cache enabled");
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 5ca4178..c6af806 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -61,24 +61,23 @@ namespace Flotsam.RegionModules.AssetCache
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
+        private bool m_Enabled;
 
         private const string m_ModuleName = "FlotsamAssetCache";
         private const string m_DefaultCacheDirectory = m_ModuleName;
         private string m_CacheDirectory = m_DefaultCacheDirectory;
 
-
-        private List<char> m_InvalidChars = new List<char>();
+        private readonly List<char> m_InvalidChars = new List<char>();
 
         private int m_LogLevel = 1;
         private ulong m_HitRateDisplay = 1; // How often to display hit statistics, given in requests
 
-        private static ulong m_Requests = 0;
-        private static ulong m_RequestsForInprogress = 0;
-        private static ulong m_DiskHits = 0;
-        private static ulong m_MemoryHits = 0;
-        private static double m_HitRateMemory = 0.0;
-        private static double m_HitRateFile = 0.0;
+        private static ulong m_Requests;
+        private static ulong m_RequestsForInprogress;
+        private static ulong m_DiskHits;
+        private static ulong m_MemoryHits;
+        private static double m_HitRateMemory;
+        private static double m_HitRateFile;
 
 #if WAIT_ON_INPROGRESS_REQUESTS
         private Dictionary<string, ManualResetEvent> m_CurrentlyWriting = new Dictionary<string, ManualResetEvent>();
@@ -87,7 +86,7 @@ namespace Flotsam.RegionModules.AssetCache
         private List<string> m_CurrentlyWriting = new List<string>();
 #endif
 
-        private ExpiringCache<string, AssetBase> m_MemoryCache = new ExpiringCache<string, AssetBase>();
+        private ExpiringCache<string, AssetBase> m_MemoryCache;
         private bool m_MemoryCacheEnabled = true;
 
         // Expiration is expressed in hours.
@@ -101,12 +100,12 @@ namespace Flotsam.RegionModules.AssetCache
         private static int m_CacheDirectoryTierLen = 3;
         private static int m_CacheWarnAt = 30000;
 
-        private System.Timers.Timer m_CachCleanTimer = new System.Timers.Timer();
+        private System.Timers.Timer m_CacheCleanTimer;
 
-        private IAssetService m_AssetService = null;
+        private IAssetService m_AssetService;
         private List<Scene> m_Scenes = new List<Scene>();
 
-        private bool m_DeepScanBeforePurge = false;
+        private bool m_DeepScanBeforePurge;
 
         public FlotsamAssetCache()
         {
@@ -128,14 +127,15 @@ namespace Flotsam.RegionModules.AssetCache
         {
             IConfig moduleConfig = source.Configs["Modules"];
             
-
             if (moduleConfig != null)
             {
-                string name = moduleConfig.GetString("AssetCaching", "");
+                string name = moduleConfig.GetString("AssetCaching", String.Empty);
 
                 if (name == Name)
                 {
+                    m_MemoryCache = new ExpiringCache<string, AssetBase>();
                     m_Enabled = true;
+
                     m_log.InfoFormat("[FLOTSAM ASSET CACHE]: {0} enabled", this.Name);
 
                     IConfig assetConfig = source.Configs["AssetCache"];
@@ -163,21 +163,11 @@ namespace Flotsam.RegionModules.AssetCache
                     m_FileExpirationCleanupTimer = TimeSpan.FromHours(assetConfig.GetDouble("FileCleanupTimer", m_DefaultFileExpiration));
                     if ((m_FileExpiration > TimeSpan.Zero) && (m_FileExpirationCleanupTimer > TimeSpan.Zero))
                     {
-                        m_CachCleanTimer.Interval = m_FileExpirationCleanupTimer.TotalMilliseconds;
-                        m_CachCleanTimer.AutoReset = true;
-                        m_CachCleanTimer.Elapsed += CleanupExpiredFiles;
-                        m_CachCleanTimer.Enabled = true;
-                        lock (m_CachCleanTimer)
-                        {
-                            m_CachCleanTimer.Start();
-                        }
-                    }
-                    else
-                    {
-                        lock (m_CachCleanTimer)
-                        {
-                            m_CachCleanTimer.Enabled = false;
-                        }
+                        m_CacheCleanTimer = new System.Timers.Timer(m_FileExpirationCleanupTimer.TotalMilliseconds);
+                        m_CacheCleanTimer.AutoReset = true;
+                        m_CacheCleanTimer.Elapsed += CleanupExpiredFiles;
+                        lock (m_CacheCleanTimer)
+                            m_CacheCleanTimer.Start();
                     }
 
                     m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);
@@ -208,7 +198,6 @@ namespace Flotsam.RegionModules.AssetCache
                     MainConsole.Instance.Commands.AddCommand(this.Name, true, "fcache clear",  "fcache clear [file] [memory]", "Remove all assets in the file and/or memory cache", HandleConsoleCommand);
                     MainConsole.Instance.Commands.AddCommand(this.Name, true, "fcache assets", "fcache assets", "Attempt a deep scan and cache of all assets in all scenes", HandleConsoleCommand);
                     MainConsole.Instance.Commands.AddCommand(this.Name, true, "fcache expire", "fcache expire <datetime>", "Purge cached assets older then the specified date/time", HandleConsoleCommand);
-
                 }
             }
         }
@@ -313,12 +302,8 @@ namespace Flotsam.RegionModules.AssetCache
 
                         }
 
-                        ThreadPool.QueueUserWorkItem(
-                            delegate
-                            {
-                                WriteFileCache(filename, asset);
-                            }
-                        );
+                        Util.FireAndForget(
+                            delegate { WriteFileCache(filename, asset); });
                     }
                 }
                 catch (Exception e)
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 4869f5d..1365e69 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -45,11 +45,13 @@ namespace OpenSim.Region.CoreModules.Asset
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
-        private ICache m_Cache = new GlynnTucker.Cache.SimpleMemoryCache();
+        private bool m_Enabled;
+        private ICache m_Cache;
+        private ulong m_Hits;
+        private ulong m_Requests;
 
         // Instrumentation
-        private uint m_DebugRate = 0;
+        private uint m_DebugRate;
 
         public Type ReplaceableInterface 
         {
@@ -72,6 +74,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                 if (name == Name)
                 {
+                    m_Cache = new GlynnTucker.Cache.SimpleMemoryCache();
                     m_Enabled = true;
 
                     m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled");
@@ -80,7 +83,6 @@ namespace OpenSim.Region.CoreModules.Asset
                     IConfig cacheConfig = source.Configs["AssetCache"];
                     if (cacheConfig != null)
                         m_DebugRate = (uint)cacheConfig.GetInt("DebugRate", 0);
-
                 }
             }
         }
@@ -117,24 +119,6 @@ namespace OpenSim.Region.CoreModules.Asset
                 m_Cache.AddOrUpdate(asset.ID, asset);
         }
 
-        private ulong m_Hits = 0;
-        private ulong m_Requests = 0;
-        private void Debug(Object asset)
-        {
-            // Temporary instrumentation to measure the hit/miss rate
-            if (m_DebugRate > 0)
-            {
-                m_Requests++;
-                if (asset != null)
-                    m_Hits++;
-
-                if ((m_Requests % m_DebugRate) == 0)
-                    m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / m_Requests) * 100);
-
-            }
-            // End instrumentation
-        }
-
         public AssetBase Get(string id)
         {
             Object asset = null;
@@ -156,5 +140,20 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             m_Cache.Clear();
         }
+
+        private void Debug(Object asset)
+        {
+            // Temporary instrumentation to measure the hit/miss rate
+            if (m_DebugRate > 0)
+            {
+                ++m_Requests;
+                if (asset != null)
+                    ++m_Hits;
+
+                if ((m_Requests % m_DebugRate) == 0)
+                    m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / (float)m_Requests) * 100.0f);
+            }
+            // End instrumentation
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 66a9b5a..cd59bdb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -224,11 +224,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
             foreach (Scene s in m_scenes)
             {
-                s.ForEachScenePresence(delegate(ScenePresence presence) 
-                                       {
-                                           TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, 
-                                                              c.Type, message, sourceType);
-                                       });
+                s.ForEachScenePresence(
+                    delegate(ScenePresence presence)
+                    {
+                        TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType);
+                    }
+                );
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 4896edf..3bb162e 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -756,7 +756,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void sendRegionHandshakeToAll()
         {
-            m_scene.Broadcast(sendRegionHandshake);
+            m_scene.ForEachClient(sendRegionHandshake);
         }
 
         public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index d2b5cb1..53c64cb 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -147,9 +147,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
 
-            if (m_scene.Entities.ContainsKey(client.AgentId))
+            EntityBase presenceEntity;
+            if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
             {
-                SendLandUpdate((ScenePresence)m_scene.Entities[client.AgentId], true);
+                SendLandUpdate((ScenePresence)presenceEntity, true);
                 SendParcelOverlay(client);
             }
         }
@@ -1061,7 +1062,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     land.LandData.OwnerID = ownerID;
 
-                    m_scene.Broadcast(SendParcelOverlay);
+                    m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(remote_client);
                 }
             }
@@ -1083,7 +1084,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                     else
                         land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
-                    m_scene.Broadcast(SendParcelOverlay);
+                    m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(remote_client);
                 }
             }
@@ -1107,7 +1108,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
                     land.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
                     land.LandData.IsGroupOwned = false;
-                    m_scene.Broadcast(SendParcelOverlay);
+                    m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(remote_client);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index b9b7da5..bfe85f1 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -139,10 +139,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
             else
             {
-                //Normal Calculations
-                return Convert.ToInt32(
-                        Math.Round((Convert.ToDecimal(LandData.Area) / Convert.ToDecimal(65536)) * m_scene.objectCapacity *
-                                   Convert.ToDecimal(m_scene.RegionInfo.RegionSettings.ObjectBonus))); ;
+                // Normal Calculations
+                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.objectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
             }
         }
         public int GetSimulatorMaxPrimCount(ILandObject thisObject)
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 6499915..d8c5ed9 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -81,8 +81,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void RegionLoaded(Scene scene)
         {
-            if (!enabledYN)
-                return;
+            if (enabledYN)
+                RegionLoadedDoWork(scene);
+        }
+
+        private void RegionLoadedDoWork(Scene scene)
+        {
 /* 
             // For testing on a single instance
             if (scene.RegionInfo.RegionLocX == 1004 && scene.RegionInfo.RegionLocY == 1000)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 4fb4c51..4e40084 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1095,7 +1095,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // The reason is so we don't cause the thread to freeze waiting
             // for the 1 second it costs to start a thread manually.
             if (!threadrunning)
-                ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread));
+                Util.FireAndForget(this.StartThread);
 
             lock (m_rootAgents)
             {
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index d651fd4..5a5fcfe 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -499,13 +499,11 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
-        public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
-                                           uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public virtual void SendAvatarData(SendAvatarData data)
         {
         }
 
-        public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid)
+        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
         }
 
@@ -521,27 +519,15 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material)
+        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
         {
         }
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
-                                                  bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+
+        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
         }
-        public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                Vector3 position, Quaternion rotation, Vector3 velocity,
-                                                Vector3 rotationalvelocity, byte state, UUID AssetId,
-                                                UUID ownerID, int attachPoint)
+
+        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
index 8e3f4a0..7251d57 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
@@ -34,7 +34,6 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         void Reset();
         void Close();
-        int MaxPrimsPerFrame { get; set; }
         void QueuePartForUpdate(SceneObjectPart part);
         void SendPrimUpdates();
     }
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 0ceef39..099fcce 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -93,40 +93,31 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                lock (m_lock)
-                {
-                    return m_eb_uuid.Count;
-                }
+                return m_eb_uuid.Count;
             }
         }
 
         public bool ContainsKey(UUID id)
         {
-            lock (m_lock)
+            try
             {
-                try
-                {
-                    return m_eb_uuid.ContainsKey(id);
-                }
-                catch
-                {
-                    return false;
-                }
+                return m_eb_uuid.ContainsKey(id);
+            }
+            catch
+            {
+                return false;
             }
         }
 
         public bool ContainsKey(uint localID)
         {
-            lock (m_lock)
+            try
             {
-                try
-                {
-                    return m_eb_localID.ContainsKey(localID);
-                }
-                catch
-                {
-                    return false;
-                }
+                return m_eb_localID.ContainsKey(localID);
+            }
+            catch
+            {
+                return false;
             }
         }
 
@@ -136,7 +127,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 try
                 {
-                    bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID);
+                    bool a = false;
+                    EntityBase entity;
+                    if (m_eb_localID.TryGetValue(localID, out entity))
+                        a = m_eb_uuid.Remove(entity.UUID);
+
                     bool b = m_eb_localID.Remove(localID);
                     return a && b;
                 }
@@ -154,7 +149,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 try 
                 {
-                    bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId);
+                    bool a = false;
+                    EntityBase entity;
+                    if (m_eb_uuid.TryGetValue(id, out entity))
+                        a = m_eb_localID.Remove(entity.LocalId);
+
                     bool b = m_eb_uuid.Remove(id);
                     return a && b;
                 }
@@ -206,14 +205,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 lock (m_lock)
                 {
-                    try
-                    {
-                        return m_eb_uuid[id];
-                    }
-                    catch
-                    {
+                    EntityBase entity;
+                    if (m_eb_uuid.TryGetValue(id, out entity))
+                        return entity;
+                    else
                         return null;
-                    }
                 }
             }
             set
@@ -228,14 +224,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 lock (m_lock)
                 {
-                    try
-                    {
-                        return m_eb_localID[localID];
-                    }
-                    catch
-                    {
+                    EntityBase entity;
+                    if (m_eb_localID.TryGetValue(localID, out entity))
+                        return entity;
+                    else
                         return null;
-                    }
                 }
             }
             set
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 627034a..4d76b4ef 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2351,12 +2351,6 @@ namespace OpenSim.Region.Framework.Scenes
                 item = InventoryService.GetItem(item);
 
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
-                IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if (ava != null)
-                {
-                    ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-                }
-
             }
             return att.UUID;
         }
@@ -2402,12 +2396,6 @@ namespace OpenSim.Region.Framework.Scenes
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = InventoryService.GetItem(item);
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
-                
-                if (m_AvatarFactory != null)
-                {
-                    m_log.InfoFormat("[SCENE INVENTORY]: Saving avatar attachment. AgentID:{0} ItemID:{1} AttachmentPoint:{2}", remoteClient.AgentId, itemID, AttachmentPt);
-                    m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-                }
             }
         }
 
@@ -2447,12 +2435,13 @@ namespace OpenSim.Region.Framework.Scenes
             if (TryGetAvatar(remoteClient.AgentId, out presence))
             {
                 presence.Appearance.DetachAttachment(itemID);
-                IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if (ava != null)
+
+                // Save avatar attachment information
+                if (m_AvatarFactory != null)
                 {
-                    ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                    m_log.Info("[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", ItemID: " + itemID);
+                    m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
-
             }
 
             m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cc74f26..5005ac9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -57,6 +57,12 @@ namespace OpenSim.Region.Framework.Scenes
 
     public partial class Scene : SceneBase
     {
+        public enum UpdatePrioritizationSchemes {
+            Time = 0,
+            Distance = 1,
+            SimpleAngularDistance = 2,
+        }
+
         public delegate void SynchronizeSceneHandler(Scene scene);
         public SynchronizeSceneHandler SynchronizeScene = null;
 
@@ -222,6 +228,10 @@ namespace OpenSim.Region.Framework.Scenes
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
         protected IAvatarFactory m_AvatarFactory;
+        public IAvatarFactory AvatarFactory
+        {
+            get { return m_AvatarFactory; }
+        }
         protected IConfigSource m_config;
         protected IRegionSerialiserModule m_serialiser;
         protected IInterregionCommsOut m_interregionCommsOut;
@@ -269,9 +279,14 @@ namespace OpenSim.Region.Framework.Scenes
         private volatile bool shuttingdown = false;
 
         private int m_lastUpdate = Environment.TickCount;
-        private int m_maxPrimsPerFrame = 200;
         private bool m_firstHeartbeat = true;
 
+        private UpdatePrioritizationSchemes m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time;
+        private bool m_reprioritization_enabled = true;
+        private double m_reprioritization_interval = 2000.0;
+        private double m_root_reprioritization_distance = 5.0;
+        private double m_child_reprioritization_distance = 10.0;
+
         private object m_deleting_scene_object = new object();
 
         // the minimum time that must elapse before a changed object will be considered for persisted
@@ -283,6 +298,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Properties
 
+        public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get { return this.m_update_prioritization_scheme; } }
+        public bool IsReprioritizationEnabled { get { return m_reprioritization_enabled; } }
+        public double ReprioritizationInterval { get { return m_reprioritization_interval; } }
+        public double RootReprioritizationDistance { get { return m_root_reprioritization_distance; } }
+        public double ChildReprioritizationDistance { get { return m_child_reprioritization_distance; } }
+
         public AgentCircuitManager AuthenticateHandler
         {
             get { return m_authenticateHandler; }
@@ -327,12 +348,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.m_syncRoot; }
         }
 
-        public int MaxPrimsPerFrame
-        {
-            get { return m_maxPrimsPerFrame; }
-            set { m_maxPrimsPerFrame = value; }
-        }
-
         /// <summary>
         /// This is for llGetRegionFPS
         /// </summary>
@@ -346,13 +361,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_defaultScriptEngine; }
         }
 
-        // Reference to all of the agents in the scene (root and child)
-        protected Dictionary<UUID, ScenePresence> m_scenePresences
-        {
-            get { return m_sceneGraph.ScenePresences; }
-            set { m_sceneGraph.ScenePresences = value; }
-        }
-
         public EntityManager Entities
         {
             get { return m_sceneGraph.Entities; }
@@ -510,7 +518,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
 
-                m_maxPrimsPerFrame = startupConfig.GetInt("MaxPrimsPerFrame", 200);
                 IConfig packetConfig = m_config.Configs["PacketPool"];
                 if (packetConfig != null)
                 {
@@ -519,6 +526,35 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
+
+                IConfig interest_management_config = m_config.Configs["InterestManagement"];
+                if (interest_management_config != null)
+                {
+                    string update_prioritization_scheme = interest_management_config.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
+                    switch (update_prioritization_scheme)
+                    {
+                        case "time":
+                            m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time;
+                            break;
+                        case "distance":
+                            m_update_prioritization_scheme = UpdatePrioritizationSchemes.Distance;
+                            break;
+                        case "simpleangulardistance":
+                            m_update_prioritization_scheme = UpdatePrioritizationSchemes.SimpleAngularDistance;
+                            break;
+                        default:
+                            m_log.Warn("[SCENE]: UpdatePrioritizationScheme was not recognized, setting to default settomg of Time");
+                            m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time;
+                            break;
+                    }
+
+                    m_reprioritization_enabled = interest_management_config.GetBoolean("ReprioritizationEnabled", true);
+                    m_reprioritization_interval = interest_management_config.GetDouble("ReprioritizationInterval", 5000.0);
+                    m_root_reprioritization_distance = interest_management_config.GetDouble("RootReprioritizationDistance", 10.0);
+                    m_child_reprioritization_distance = interest_management_config.GetDouble("ChildReprioritizationDistance", 20.0);
+                }
+
+                m_log.Info("[SCENE]: Using the " + m_update_prioritization_scheme + " prioritization scheme");
             }
             catch
             {
@@ -1144,14 +1180,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="stats">Stats on the Simulator's performance</param>
         private void SendSimStatsPackets(SimStats stats)
         {
-            List<ScenePresence> StatSendAgents = GetScenePresences();
-            foreach (ScenePresence agent in StatSendAgents)
-            {
-                if (!agent.IsChildAgent)
+            ForEachScenePresence(
+                delegate(ScenePresence agent)
                 {
-                    agent.ControllingClient.SendSimStats(stats);
+                    if (!agent.IsChildAgent)
+                        agent.ControllingClient.SendSimStats(stats);
                 }
-            }
+            );
         }
 
         /// <summary>
@@ -1200,15 +1235,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Perform delegate action on all clients subscribing to updates from this region.
-        /// </summary>
-        /// <returns></returns>
-        public void Broadcast(Action<IClientAPI> whatToDo)
-        {
-            ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
-        }
-
-        /// <summary>
         /// Backup the scene.  This acts as the main method of the backup thread.
         /// </summary>
         /// <returns></returns>
@@ -3054,17 +3080,13 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_eventManager.TriggerOnRemovePresence(agentID);
-                Broadcast(delegate(IClientAPI client)
-                          {
-                              try
-                              {
-                                  client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
-                              }
-                              catch (NullReferenceException)
-                              {
-                                  //We can safely ignore null reference exceptions.  It means the avatar are dead and cleaned up anyway.
-                              }
-                          });
+                ForEachClient(
+                    delegate(IClientAPI client)
+                    {
+                        //We can safely ignore null reference exceptions.  It means the avatar is dead and cleaned up anyway
+                        try { client.SendKillObject(avatar.RegionHandle, avatar.LocalId); }
+                        catch (NullReferenceException) { }
+                    });
 
                 ForEachScenePresence(
                     delegate(ScenePresence presence) { presence.CoarseLocationChange(); });
@@ -3149,7 +3171,7 @@ namespace OpenSim.Region.Framework.Scenes
                         return;
                 }
             }
-            Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
+            ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
         }
 
         #endregion
@@ -3475,10 +3497,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence presence;
 
-            lock (m_scenePresences)
-            {
-                m_scenePresences.TryGetValue(agentID, out presence);
-            }
+            lock (m_sceneGraph.ScenePresences)
+                m_sceneGraph.ScenePresences.TryGetValue(agentID, out presence);
 
             if (presence != null)
             {
@@ -3688,12 +3708,9 @@ namespace OpenSim.Region.Framework.Scenes
         public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position,
                                             Vector3 lookAt, uint teleportFlags)
         {
-            ScenePresence sp = null;
-            lock (m_scenePresences)
-            {
-                if (m_scenePresences.ContainsKey(remoteClient.AgentId))
-                    sp = m_scenePresences[remoteClient.AgentId];
-            }
+            ScenePresence sp;
+            lock (m_sceneGraph.ScenePresences)
+                m_sceneGraph.ScenePresences.TryGetValue(remoteClient.AgentId, out sp);
 
             if (sp != null)
             {
@@ -4142,7 +4159,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ForEachScenePresence(Action<ScenePresence> action)
         {
             // We don't want to try to send messages if there are no avatars.
-            if (m_scenePresences != null)
+            if (m_sceneGraph != null && m_sceneGraph.ScenePresences != null)
             {
                 try
                 {
@@ -4222,7 +4239,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void ForEachClient(Action<IClientAPI> action)
         {
-            m_sceneGraph.ForEachClient(action);
+            ClientManager.ForEach(action);
         }
 
         public void ForEachSOG(Action<SceneObjectGroup> action)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ba5119f..deee6c3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -467,7 +467,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
         {
             // If we can't take it, we can't attach it!
-            //
             SceneObjectPart part = m_parentScene.GetSceneObjectPart(objectLocalID);
             if (part == null)
                 return;
@@ -477,9 +476,16 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             // Calls attach with a Zero position
-            //
             AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false);
             m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+
+            // Save avatar attachment information
+            ScenePresence presence;
+            if (m_parentScene.AvatarFactory != null && m_parentScene.TryGetAvatar(remoteClient.AgentId, out presence))
+            {
+                m_log.Info("[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", AttachmentPoint: " + AttachmentPt);
+                m_parentScene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+            }
         }
 
         public SceneObjectGroup RezSingleAttachment(
@@ -574,7 +580,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
 
-                    group.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
+                    group.SetAttachmentPoint((byte)AttachmentPt);
                     group.AbsolutePosition = attachPos;
 
                     // Saves and gets itemID
@@ -613,7 +619,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance);
             newAvatar.IsChildAgent = true;
-            newAvatar.MaxPrimsPerFrame = m_parentScene.MaxPrimsPerFrame;
 
             AddScenePresence(newAvatar);
 
@@ -847,7 +852,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="localID"></param>
         /// <returns>null if no scene object group containing that prim is found</returns>
-        private SceneObjectGroup GetGroupByPrim(uint localID)
+        public SceneObjectGroup GetGroupByPrim(uint localID)
         {
             if (Entities.ContainsKey(localID))
                 return Entities[localID] as SceneObjectGroup;
@@ -1107,23 +1112,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return UUID.Zero;
         }
 
-        protected internal void ForEachClient(Action<IClientAPI> action)
-        {
-            List<ScenePresence> splist = GetScenePresences();
-            foreach (ScenePresence presence in splist)
-            {
-                try
-                {
-                    action(presence.ControllingClient);
-                }
-                catch (Exception e)
-                {
-                    // Catch it and move on. This includes situations where splist has inconsistent info
-                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachClient: ", e.Message);
-                }
-            }
-        }
-
         protected internal void ForEachSOG(Action<SceneObjectGroup> action)
         {
             List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b8bd9b4..69b3ded 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -906,7 +906,7 @@ namespace OpenSim.Region.Framework.Scenes
                 SetAttachmentPoint(Convert.ToByte(attachmentpoint));
 
                 avatar.AddAttachment(this);
-                m_log.DebugFormat("[SOG]: Added att {0} to avie {1}", UUID, avatar.UUID);
+                m_log.Debug("[SOG]: Added attachment " + UUID + " to avatar " + avatar.UUID);
 
                 if (!silent)
                 {
@@ -1824,7 +1824,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags)
         {
 
-            remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.ObjectOwner, RootPart.GroupID, RootPart.BaseMask,
+            remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask,
                                                         RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask,
                                                         RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category,
                                                         RootPart.CreatorID, RootPart.Name, RootPart.Description);
@@ -3355,5 +3355,77 @@ namespace OpenSim.Region.Framework.Scenes
 
             return true;
         }
+
+        public double GetUpdatePriority(IClientAPI client)
+        {
+            switch (Scene.UpdatePrioritizationScheme)
+            {
+                case Scene.UpdatePrioritizationSchemes.Time:
+                    return GetPriorityByTime();
+                case Scene.UpdatePrioritizationSchemes.Distance:
+                    return GetPriorityByDistance(client);
+                case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance:
+                    return GetPriorityBySimpleAngularDistance(client);
+                default:
+                    throw new InvalidOperationException("UpdatePrioritizationScheme not defined");
+            }
+        }
+
+        private double GetPriorityByTime()
+        {
+            return DateTime.Now.ToOADate();
+        }
+
+        private double GetPriorityByDistance(IClientAPI client)
+        {
+            ScenePresence presence = Scene.GetScenePresence(client.AgentId);
+            if (presence != null)
+            {
+                return GetPriorityByDistance((presence.IsChildAgent) ?
+                    presence.AbsolutePosition : presence.CameraPosition);
+            }
+            return double.NaN;
+        }
+
+        private double GetPriorityBySimpleAngularDistance(IClientAPI client)
+        {
+            ScenePresence presence = Scene.GetScenePresence(client.AgentId);
+            if (presence != null)
+            {
+                return GetPriorityBySimpleAngularDistance((presence.IsChildAgent) ?
+                    presence.AbsolutePosition : presence.CameraPosition);
+            }
+            return double.NaN;
+        }
+
+        public double GetPriorityByDistance(Vector3 position)
+        {
+            return Vector3.Distance(AbsolutePosition, position);
+        }
+
+        public double GetPriorityBySimpleAngularDistance(Vector3 position)
+        {
+            double distance = Vector3.Distance(position, AbsolutePosition);
+            if (distance >= double.Epsilon)
+            {
+                float height;
+                Vector3 box = GetAxisAlignedBoundingBox(out height);
+
+                double angle = box.X / distance;
+                double max = angle;
+
+                angle = box.Y / distance;
+                if (max < angle)
+                    max = angle;
+
+                angle = box.Z / distance;
+                if (max < angle)
+                    max = angle;
+
+                return -max;
+            }
+            else
+                return double.MinValue;
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 23a7021..32171a0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -841,16 +841,6 @@ if (m_shape != null) {
                 return m_offsetPosition + m_groupPosition; }
         }
 
-        public UUID ObjectCreator
-        {
-            get { return _creatorID; }
-        }
-
-        public UUID ObjectOwner
-        {
-            get { return _ownerID; }
-        }
-
         public SceneObjectGroup ParentGroup
         {
             get { return m_parentGroup; }
@@ -1427,7 +1417,7 @@ if (m_shape != null) {
             // Move afterwards ResetIDs as it clears the localID
             dupe.LocalId = localID;
             // This may be wrong...    it might have to be applied in SceneObjectGroup to the object that's being duplicated.
-            dupe._lastOwnerID = ObjectOwner;
+            dupe._lastOwnerID = OwnerID;
 
             byte[] extraP = new byte[Shape.ExtraParams.Length];
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
@@ -2388,10 +2378,10 @@ if (m_shape != null) {
                 //isattachment = ParentGroup.RootPart.IsAttachment;
 
             byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
-            remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
+            remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
                                                lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
                                                m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
-                                               AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius);
+                                               AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient)));
         }
 
         /// <summary>
@@ -3764,13 +3754,15 @@ if (m_shape != null) {
                 if (ParentGroup.RootPart == this)
                     lPos = AbsolutePosition;
             }
-
-            remoteClient.SendPrimTerseUpdate(m_regionHandle,
+            
+            // Causes this thread to dig into the Client Thread Data.
+            // Remember your locking here!
+            remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle,
                     (ushort)(m_parentGroup.GetTimeDilation() *
                     (float)ushort.MaxValue), LocalId, lPos,
-                    RotationOffset, Velocity,
+                    RotationOffset, Velocity, Acceleration,
                     RotationalVelocity, state, FromItemID,
-                    OwnerID, (int)AttachmentPoint);
+                    OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient)));
         }
                 
         public void AddScriptLPS(int count)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 098e010..f4ca877 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -871,12 +871,15 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (IScriptModule e in engines)
                     {
-                        string n = e.GetAssemblyName(item.ItemID);
-                        if (n != "")
+                        if (e != null)
                         {
-                            if (!ret.Contains(n))
-                                ret.Add(n);
-                            break;
+                            string n = e.GetAssemblyName(item.ItemID);
+                            if (n != String.Empty)
+                            {
+                                if (!ret.Contains(n))
+                                    ret.Add(n);
+                                break;
+                            }
                         }
                     }
                 }
@@ -898,12 +901,15 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (IScriptModule e in engines)
                     {
-                        string n = e.GetXMLState(item.ItemID);
-                        if (n != "")
+                        if (e != null)
                         {
-                            if (!ret.ContainsKey(item.ItemID))
-                                ret[item.ItemID] = n;
-                            break;
+                            string n = e.GetXMLState(item.ItemID);
+                            if (n != String.Empty)
+                            {
+                                if (!ret.ContainsKey(item.ItemID))
+                                    ret[item.ItemID] = n;
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c25fa55..d7113bf 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Timers;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -127,8 +128,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private bool m_setAlwaysRun;
 
-        private bool m_updatesAllowed = true;
-        private List<AgentUpdateArgs> m_agentUpdates = new List<AgentUpdateArgs>();
         private string m_movementAnimation = "DEFAULT";
         private long m_animPersistUntil = 0;
         private bool m_allowFalling = false;
@@ -172,6 +171,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         // Position of agent's camera in world (region cordinates)
         protected Vector3 m_CameraCenter = Vector3.Zero;
+        protected Vector3 m_lastCameraCenter = Vector3.Zero;
+
+        protected Timer m_reprioritization_timer;
+        protected bool m_reprioritizing = false;
+        protected bool m_reprioritization_called = false;
 
         // Use these three vectors to figure out what the agent is looking at
         // Convert it to a Matrix and/or Quaternion
@@ -403,12 +407,6 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_parentPosition = value; }
         }
 
-        public int MaxPrimsPerFrame
-        {
-            get { return m_sceneViewer.MaxPrimsPerFrame; }
-            set { m_sceneViewer.MaxPrimsPerFrame = value; }
-        }
-
         /// <summary>
         /// Absolute position of this avatar in 'region cordinates'
         /// </summary>
@@ -645,7 +643,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scriptEngines = m_scene.RequestModuleInterfaces<IScriptModule>();
 
-            AbsolutePosition = m_controllingClient.StartPos;
+            AbsolutePosition = posLastSignificantMove = m_CameraCenter =
+                m_lastCameraCenter = m_controllingClient.StartPos;
+
+            m_reprioritization_timer = new Timer(world.ReprioritizationInterval);
+            m_reprioritization_timer.Elapsed += new ElapsedEventHandler(Reprioritize);
+            m_reprioritization_timer.AutoReset = false;
+
+
             AdjustKnownSeeds();
 
             TrySetMovementAnimation("STAND"); // TODO: I think, this won't send anything, as we are still a child here...
@@ -1083,34 +1088,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         }
 
-        // These methods allow to queue up agent updates (like key presses)
-        // until all attachment scripts are running and the animations from
-        // AgentDataUpdate have been started. It is essential for combat
-        // devices, weapons and AOs that keypresses are not processed
-        // until scripts that are potentially interested in them are
-        // up and running and that animations a script knows to be running
-        // from before a crossing are running again
-        //
-        public void LockAgentUpdates()
-        {
-            m_updatesAllowed = false;
-        }
-
-        public void UnlockAgentUpdates()
-        {
-            lock (m_agentUpdates)
-            {
-                if (m_updatesAllowed == false)
-                {
-                    foreach (AgentUpdateArgs a in m_agentUpdates)
-                        RealHandleAgentUpdate(ControllingClient, a);
-                    m_agentUpdates.Clear();
-                    m_updatesAllowed = true;
-                }
-            }
-        }
-
-
         /// <summary>
         /// Callback for the Camera view block check.  Gets called with the results of the camera view block test
         /// hitYN is true when there's something in the way.
@@ -1148,43 +1125,30 @@ namespace OpenSim.Region.Framework.Scenes
             } 
         }
 
+        Array m_dirControlFlags = Enum.GetValues(typeof(Dir_ControlFlags));
+
         /// <summary>
         /// This is the event handler for client movement.   If a client is moving, this event is triggering.
         /// </summary>
         public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
-            lock (m_agentUpdates)
-            {
-                if (m_updatesAllowed)
-                {
-                    RealHandleAgentUpdate(remoteClient, agentData);
-                    return;
-                }
-                
-                m_agentUpdates.Add(agentData);
-            }
-        }
-
-        private void RealHandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
-        {
             //if (m_isChildAgent)
             //{
             //    // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
             //    return;
             //}
 
-            
-            m_movementUpdateCount++;
-            if (m_movementUpdateCount >= int.MaxValue)
-                m_movementUpdateCount = 1;
+            m_perfMonMS = Environment.TickCount;
 
+            ++m_movementUpdateCount;
+            if (m_movementUpdateCount < 1)
+                m_movementUpdateCount = 1;
 
             // Must check for standing up even when PhysicsActor is null,
             // since sitting currently removes avatar from physical scene
             //m_log.Debug("agentPos:" + AbsolutePosition.ToString());
 
             // This is irritating.  Really.
-
             if (!AbsolutePosition.IsFinite())
             {
                 RemoveFromPhysicalScene();
@@ -1205,19 +1169,17 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_LastFinitePos = m_pos;
             }
-            //m_physicsActor.AddForce(new PhysicsVector(999999999, 99999999, 999999999999999), true);
 
+            //m_physicsActor.AddForce(new PhysicsVector(999999999, 99999999, 999999999999999), true);
 
             //ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
             //if (land != null)
             //{
-                //if (land.landData.landingType == (byte)1 && land.landData.userLocation != Vector3.Zero)
-                //{
-                //    agent.startpos = land.landData.userLocation;
-                //}
+            //if (land.landData.landingType == (byte)1 && land.landData.userLocation != Vector3.Zero)
+            //{
+            //    agent.startpos = land.landData.userLocation;
+            //}
             //}
-
-            m_perfMonMS = Environment.TickCount;
 
             uint flags = agentData.ControlFlags;
             Quaternion bodyRotation = agentData.BodyRotation;
@@ -1225,6 +1187,11 @@ namespace OpenSim.Region.Framework.Scenes
             // Camera location in world.  We'll need to raytrace
             // from this location from time to time.
             m_CameraCenter = agentData.CameraCenter;
+            if (Vector3.Distance(m_lastCameraCenter, m_CameraCenter) >= Scene.RootReprioritizationDistance)
+            {
+                ReprioritizeUpdates();
+                m_lastCameraCenter = m_CameraCenter;
+            }
 
             // Use these three vectors to figure out what the agent is looking at
             // Convert it to a Matrix and/or Quaternion
@@ -1235,7 +1202,7 @@ namespace OpenSim.Region.Framework.Scenes
             // The Agent's Draw distance setting
             m_DrawDistance = agentData.Far;
 
-            if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
+            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
             {
                 StandUp();
             }
@@ -1243,14 +1210,13 @@ namespace OpenSim.Region.Framework.Scenes
             // Check if Client has camera in 'follow cam' or 'build' mode.
             Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
 
-            m_followCamAuto = ((m_CameraUpAxis.Z > 0.959f && m_CameraUpAxis.Z < 0.98f) 
+            m_followCamAuto = ((m_CameraUpAxis.Z > 0.959f && m_CameraUpAxis.Z < 0.98f)
                && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false;
 
             //m_log.DebugFormat("[FollowCam]: {0}", m_followCamAuto);
             // Raycast from the avatar's head to the camera to see if there's anything blocking the view
             if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast())
             {
-
                 if (m_followCamAuto)
                 {
                     Vector3 headadjustment = new Vector3(0, 0, 0.3f);
@@ -1258,24 +1224,18 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            m_mouseLook = (flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
-
-            
-
+            m_mouseLook = (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
             m_leftButtonDown = (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
 
-           
-
             lock (scriptedcontrols)
             {
                 if (scriptedcontrols.Count > 0)
                 {
                     SendControlToScripts(flags);
                     flags = RemoveIgnoredControls(flags, IgnoredControls);
-
                 }
             }
-            
+
             if (PhysicsActor == null)
             {
                 return;
@@ -1284,7 +1244,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_autopilotMoving)
                 CheckAtSitTarget();
 
-            if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
+            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
             {
                 // TODO: This doesn't prevent the user from walking yet.
                 // Setting parent ID would fix this, if we knew what value
@@ -1317,13 +1277,13 @@ namespace OpenSim.Region.Framework.Scenes
                         PhysicsActor.Flying = false;
                     else
                         PhysicsActor.Flying = ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
-                    
+
                     if (PhysicsActor.Flying != oldflying)
                     {
                         update_movementflag = true;
                     }
                 }
-                
+
                 if (q != m_bodyRot)
                 {
                     m_bodyRot = q;
@@ -1339,15 +1299,15 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // use camera up angle when in mouselook and not flying or when holding the left mouse button down and not flying
                     // this prevents 'jumping' in inappropriate situations.
-                    if ((m_mouseLook && !m_physicsActor.Flying) || (m_leftButtonDown && !m_physicsActor.Flying)) 
+                    if ((m_mouseLook && !m_physicsActor.Flying) || (m_leftButtonDown && !m_physicsActor.Flying))
                         dirVectors = GetWalkDirectionVectors();
                     else
                         dirVectors = Dir_Vectors;
 
 
-                    foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof (Dir_ControlFlags)))
+                    foreach (Dir_ControlFlags DCF in m_dirControlFlags)
                     {
-                        if ((flags & (uint) DCF) != 0)
+                        if ((flags & (uint)DCF) != 0)
                         {
                             bResetMoveToPosition = true;
                             DCFlagKeyPressed = true;
@@ -1359,18 +1319,18 @@ namespace OpenSim.Region.Framework.Scenes
                             {
                                 // Why did I get this?
                             }
-                            
-                            if ((m_movementflag & (uint) DCF) == 0)
+
+                            if ((m_movementflag & (uint)DCF) == 0)
                             {
-                                m_movementflag += (byte) (uint) DCF;
+                                m_movementflag += (byte)(uint)DCF;
                                 update_movementflag = true;
                             }
                         }
                         else
                         {
-                            if ((m_movementflag & (uint) DCF) != 0)
+                            if ((m_movementflag & (uint)DCF) != 0)
                             {
-                                m_movementflag -= (byte) (uint) DCF;
+                                m_movementflag -= (byte)(uint)DCF;
                                 update_movementflag = true;
                             }
                             else
@@ -1461,14 +1421,12 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                             catch (Exception)
                             {
-
                                 //Avoid system crash, can be slower but...
                             }
-
                         }
                     }
                 }
-                
+
                 // Cause the avatar to stop flying if it's colliding
                 // with something with the down arrow pressed.
 
@@ -1476,8 +1434,8 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_physicsActor != null && m_physicsActor.Flying && !m_forceFly)
                 {
                     // Are the landing controls requirements filled?
-                    bool controlland = (((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) ||
-                                        ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
+                    bool controlland = (((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) ||
+                                        ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
 
                     // Are the collision requirements fulfilled?
                     bool colliding = (m_physicsActor.IsColliding == true);
@@ -1490,10 +1448,10 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
                 {
-//                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
-//                    m_log.DebugFormat(
-//                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
-                    
+                    //                    m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
+                    //                    m_log.DebugFormat(
+                    //                        "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
+
                     AddNewMovement(agent_control_v3, q);
 
                     if (update_movementflag)
@@ -2456,11 +2414,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_perfMonMS = Environment.TickCount;
 
                 Vector3 pos = m_pos;
-                Vector3 vel = Velocity;
-                Quaternion rot = m_bodyRot;
                 pos.Z -= m_appearance.HipOffset;
-                remoteClient.SendAvatarTerseUpdate(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, new Vector3(pos.X, pos.Y, pos.Z),
-                                                   new Vector3(vel.X, vel.Y, vel.Z), rot, m_uuid);
+
+                remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
+                    pos, m_velocity, Vector3.Zero, m_rotation, Vector4.Zero, m_uuid, null, GetUpdatePriority(remoteClient)));
 
                 m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS);
                 m_scene.StatsReporter.AddAgentUpdates(1);
@@ -2474,7 +2431,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_perfMonMS = Environment.TickCount;
 
-            m_scene.Broadcast(SendTerseUpdateToClient);
+            m_scene.ForEachClient(SendTerseUpdateToClient);
 
             m_lastVelocity = m_velocity;
             lastPhysPos = AbsolutePosition;
@@ -2566,9 +2523,9 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 pos = m_pos;
             pos.Z -= m_appearance.HipOffset;
 
-            remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
+            remoteAvatar.m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
                                                             LocalId, m_pos, m_appearance.Texture.GetBytes(),
-                                                            m_parentID, rot);
+                                                            m_parentID, rot));
             m_scene.StatsReporter.AddAgentUpdates(1);
         }
 
@@ -2637,8 +2594,8 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 pos = m_pos;
             pos.Z -= m_appearance.HipOffset;
 
-            m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
-                                               m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot);
+            m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
+                                               m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot));
 
             if (!m_isChildAgent)
             {
@@ -2744,8 +2701,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             Quaternion rot = m_bodyRot;
-            m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
-                m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot);
+            m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
+                m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot));
 
         }
 
@@ -2776,7 +2733,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_isChildAgent)
                 return;
 
-            m_scene.Broadcast(
+            m_scene.ForEachClient(
                 delegate(IClientAPI client) { client.SendAnimations(animations, seqs, m_controllingClient.AgentId, objectIDs); });
         }
 
@@ -2830,7 +2787,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m
-            if (Util.GetDistanceTo(AbsolutePosition,m_LastChildAgentUpdatePosition) > 32)
+            if (Util.GetDistanceTo(AbsolutePosition, m_LastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance)
             {
                 ChildAgentDataUpdate cadu = new ChildAgentDataUpdate();
                 cadu.ActiveGroupID = UUID.Zero.Guid;
@@ -3125,6 +3082,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (cAgentData.Position != new Vector3(-1, -1, -1)) // UGH!!
                 m_pos = new Vector3(cAgentData.Position.X + shiftx, cAgentData.Position.Y + shifty, cAgentData.Position.Z);
 
+            if (Vector3.Distance(AbsolutePosition, posLastSignificantMove) >= Scene.ChildReprioritizationDistance)
+            {
+                posLastSignificantMove = AbsolutePosition;
+                ReprioritizeUpdates();
+            }
+
             // It's hard to say here..   We can't really tell where the camera position is unless it's in world cordinates from the sending region
             m_CameraCenter = cAgentData.Center;
 
@@ -3487,7 +3450,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Close()
         {
-
             lock (m_attachments)
             {
                 // Delete attachments from scene
@@ -3505,10 +3467,19 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_knownChildRegions.Clear();
             }
+
+            lock (m_reprioritization_timer)
+            {
+                m_reprioritization_timer.Enabled = false;
+                m_reprioritization_timer.Elapsed -= new ElapsedEventHandler(Reprioritize);
+            }
+            // I don't get it but mono crashes when you try to dispose of this timer,
+            // unsetting the elapsed callback should be enough to allow for cleanup however.
+            //m_reprioritizationTimer.Dispose();
+
             m_sceneViewer.Close();
 
             RemoveFromPhysicalScene();
-            GC.Collect();
         }
 
         public ScenePresence()
@@ -3884,5 +3855,115 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+
+        public double GetUpdatePriority(IClientAPI client)
+        {
+            switch (Scene.UpdatePrioritizationScheme)
+            {
+                case Scene.UpdatePrioritizationSchemes.Time:
+                    return GetPriorityByTime();
+                case Scene.UpdatePrioritizationSchemes.Distance:
+                    return GetPriorityByDistance(client);
+                case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance:
+                    return GetPriorityByDistance(client);
+                default:
+                    throw new InvalidOperationException("UpdatePrioritizationScheme not defined.");
+            }
+        }
+
+        private double GetPriorityByTime()
+        {
+            return DateTime.Now.ToOADate();
+        }
+
+        private double GetPriorityByDistance(IClientAPI client)
+        {
+            ScenePresence presence = Scene.GetScenePresence(client.AgentId);
+            if (presence != null)
+            {
+                return GetPriorityByDistance((presence.IsChildAgent) ?
+                    presence.AbsolutePosition : presence.CameraPosition);
+            }
+            return double.NaN;
+        }
+
+        private double GetPriorityByDistance(Vector3 position)
+        {
+            return Vector3.Distance(AbsolutePosition, position);
+        }
+
+        private double GetSOGUpdatePriority(SceneObjectGroup sog)
+        {
+            switch (Scene.UpdatePrioritizationScheme)
+            {
+                case Scene.UpdatePrioritizationSchemes.Time:
+                    throw new InvalidOperationException("UpdatePrioritizationScheme for time not supported for reprioritization");
+                case Scene.UpdatePrioritizationSchemes.Distance:
+                    return sog.GetPriorityByDistance((IsChildAgent) ? AbsolutePosition : CameraPosition);
+                case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance:
+                    return sog.GetPriorityBySimpleAngularDistance((IsChildAgent) ? AbsolutePosition : CameraPosition);
+                default:
+                    throw new InvalidOperationException("UpdatePrioritizationScheme not defined");
+            }
+        }
+
+        private double UpdatePriority(UpdatePriorityData data)
+        {
+            EntityBase entity;
+            SceneObjectGroup group;
+
+            if (Scene.Entities.TryGetValue(data.localID, out entity))
+            {
+                group = entity as SceneObjectGroup;
+                if (group != null)
+                    return GetSOGUpdatePriority(group);
+
+                ScenePresence presence = entity as ScenePresence;
+                if (presence == null)
+                    throw new InvalidOperationException("entity found is neither SceneObjectGroup nor ScenePresence");
+                switch (Scene.UpdatePrioritizationScheme)
+                {
+                    case Scene.UpdatePrioritizationSchemes.Time:
+                        throw new InvalidOperationException("UpdatePrioritization for time not supported for reprioritization");
+                    case Scene.UpdatePrioritizationSchemes.Distance:
+                    case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance:
+                        return GetPriorityByDistance((IsChildAgent) ? AbsolutePosition : CameraPosition);
+                    default:
+                        throw new InvalidOperationException("UpdatePrioritizationScheme not defined");
+                }
+            }
+            else
+            {
+                group = Scene.SceneGraph.GetGroupByPrim(data.localID);
+                if (group != null)
+                    return GetSOGUpdatePriority(group);
+            }
+            return double.NaN;
+        }
+
+        private void ReprioritizeUpdates()
+        {
+            if (Scene.IsReprioritizationEnabled && Scene.UpdatePrioritizationScheme != Scene.UpdatePrioritizationSchemes.Time)
+            {
+                lock (m_reprioritization_timer)
+                {
+                    if (!m_reprioritizing)
+                        m_reprioritization_timer.Enabled = m_reprioritizing = true;
+                    else
+                        m_reprioritization_called = true;
+                }
+            }
+        }
+
+        private void Reprioritize(object sender, ElapsedEventArgs e)
+        {
+            m_controllingClient.ReprioritizeUpdates(StateUpdateTypes.All, UpdatePriority);
+
+            lock (m_reprioritization_timer)
+            {
+                m_reprioritization_timer.Enabled = m_reprioritizing = m_reprioritization_called;
+                m_reprioritization_called = false;
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 8ab0552..e4296ef 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -45,14 +45,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected Dictionary<UUID, ScenePartUpdate> m_updateTimes = new Dictionary<UUID, ScenePartUpdate>();
 
-        protected int m_maxPrimsPerFrame = 200;
-
-        public int MaxPrimsPerFrame
-        {
-            get { return m_maxPrimsPerFrame; }
-            set { m_maxPrimsPerFrame = value; }
-        }
-
         public SceneViewer()
         {
         }
@@ -82,16 +74,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_pendingObjects = new Queue<SceneObjectGroup>();
 
-                    List<EntityBase> ents = new List<EntityBase>(m_presence.Scene.Entities);
-                    if (!m_presence.IsChildAgent) // Proximity sort makes no sense for
-                    {                    // Child agents
-                        ents.Sort(delegate(EntityBase a, EntityBase b)
-                        {
-                            return Vector3.Distance(m_presence.AbsolutePosition, a.AbsolutePosition).CompareTo(Vector3.Distance(m_presence.AbsolutePosition, b.AbsolutePosition));
-                        });
-                    }
-                  
-                    foreach (EntityBase e in ents)
+                    foreach (EntityBase e in m_presence.Scene.Entities)
                     {
                         if (e is SceneObjectGroup)
                             m_pendingObjects.Enqueue((SceneObjectGroup)e);
@@ -99,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < m_maxPrimsPerFrame)
+            while (m_pendingObjects != null && m_pendingObjects.Count > 0)
             {
                 SceneObjectGroup g = m_pendingObjects.Dequeue();
 
@@ -183,8 +166,6 @@ namespace OpenSim.Region.Framework.Scenes
                             m_presence.GenerateClientFlags(part.UUID));
                 }
             }
-
-            m_presence.ControllingClient.FlushPrimUpdates();
         }
 
         public void Reset()
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
index 29c4672..f3be028 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
         string Description { get; set; }
 
         UUID UUID { get; }
-        UUID ObjectOwner { get; }
-        UUID ObjectCreator { get; }
+        UUID OwnerID { get; }
+        UUID CreatorID { get; }
         Vector3 AbsolutePosition { get; }
 
         string SitName { get; set; }
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index af18a98..d7198f0 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -68,12 +68,12 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
             get { return UUID.Zero; }
         }
 
-        public UUID ObjectOwner
+        public UUID OwnerID
         {
             get { return UUID.Zero; }
         }
 
-        public UUID ObjectCreator
+        public UUID CreatorID
         {
             get { return UUID.Zero; }
         }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 434da0a..df03b8d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1013,12 +1013,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public void SendAvatarData(SendAvatarData data)
         {
             
         }
 
-        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid)
+        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
             
         }
@@ -1038,19 +1038,19 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        public void SendPrimitiveToClient(SendPrimitiveData data)
         {
             
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material)
+        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
             
         }
 
-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
+        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
-            
+
         }
 
         public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems)
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index b209199..b2544fa 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1244,18 +1244,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title);
 
             ScenePresence presence = null;
-            lock (m_sceneList)
+
+            foreach (Scene scene in m_sceneList)
             {
-                foreach (Scene scene in m_sceneList)
+                presence = scene.GetScenePresence(AgentID);
+                if (presence != null)
                 {
-                    presence = scene.GetScenePresence(AgentID);
-                    if (presence != null)
-                    {
-                        presence.Grouptitle = Title;
+                    presence.Grouptitle = Title;
 
-                        // FixMe: Ter suggests a "Schedule" method that I can't find.
-                        presence.SendFullUpdateToAllClients();
-                    }
+                    // FixMe: Ter suggests a "Schedule" method that I can't find.
+                    presence.SendFullUpdateToAllClients();
                 }
             }
         }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 0379180..e185351 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -188,7 +188,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             // MISC COMPARISONS (UUID, Byte)
             if (first.ClickAction != second.ClickAction)
                 result |= Diff.CLICKACTION;
-            if (first.ObjectOwner != second.ObjectOwner)
+            if (first.OwnerID != second.OwnerID)
                 result |= Diff.OBJECTOWNER;
 
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index ce50f9e..4521f8e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                     if (e.InnerException != null)
                         m_log.Error("[MRM] " + e.InnerException);
 
-                    m_scene.Broadcast(delegate(IClientAPI user)
+                    m_scene.ForEachClient(delegate(IClientAPI user)
                     {
                         user.SendAlertMessage(
                             "MRM UnAuthorizedAccess: " + e);
@@ -268,7 +268,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 catch (Exception e)
                 {
                     m_log.Info("[MRM] Error: " + e);
-                    m_scene.Broadcast(delegate(IClientAPI user)
+                    m_scene.ForEachClient(delegate(IClientAPI user)
                                           {
                                               user.SendAlertMessage(
                                                   "Compile error while building MRM script, check OpenSim console for more information.");
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index f7c63ac..f7cadaa 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -588,13 +588,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
-                                           uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public virtual void SendAvatarData(SendAvatarData data)
         {
         }
 
-        public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentId)
+        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
         }
 
@@ -610,26 +608,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material)
+        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
         {
         }
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
-                                                  bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+
+        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
         }
-        public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                Vector3 position, Quaternion rotation, Vector3 velocity,
-                                                Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint)
+
+        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1ea08e2..f609e73 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -289,6 +289,9 @@ namespace OpenSim.Region.Physics.Meshing
                         ManagedImage managedImage;  // we never use this
                         OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata);
 
+                        // Remove the reference to the encoded JPEG2000 data so it can be GCed
+                        primShape.SculptData = Utils.EmptyBytes;
+
                         if (cacheSculptMaps)
                         {
                             try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 1fff846..71ace16 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -139,8 +139,14 @@ namespace OpenSim.Region.Physics.OdePlugin
         public int m_eventsubscription = 0;
         private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
 
+        // unique UUID of this character object
+        public UUID m_uuid;
+        public bool bad = false;
+
         public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
         {
+            m_uuid = UUID.Random();
+
             // ode = dode;
             _velocity = new PhysicsVector();
             _target_velocity = new PhysicsVector();
@@ -225,11 +231,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             set { m_localID = value; }
         }
 
-        public override int GetHashCode()
-        {
-            return (int)m_localID;
-        }
-
         public override bool Grabbed
         {
             set { return; }
@@ -1112,10 +1113,11 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             catch (NullReferenceException)
             {
+                bad = true;
                 _parent_scene.BadCharacter(this);
                 vec = new d.Vector3(_position.X, _position.Y, _position.Z);
                 base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
-                m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name);
+                m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar {0}, physical actor {1}", m_name, m_uuid);
             }
             
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 9429544..0a065be 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1665,6 +1665,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (!_characters.Contains(chr))
                 {
                     _characters.Add(chr);
+                    if (chr.bad)
+                        m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
                 }
             }
         }
@@ -2587,7 +2589,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 lock (_taintedActors)
                 {
                     if (!(_taintedActors.Contains(taintedchar)))
+                    {
                         _taintedActors.Add(taintedchar);
+                        if (taintedchar.bad)
+                            m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
+                    }
                 }
             }
         }
@@ -2992,7 +2998,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                     foreach (OdeCharacter actor in _characters)
                     {
                         if (actor != null)
+                        {
+                            if (actor.bad)
+                                m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
                             actor.UpdatePositionAndVelocity();
+                        }
                     }
                 }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7c176bb..11f255f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -137,13 +137,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return lease;
         }
 
-        protected virtual void ConditionalScriptSleep(int delay)
-        {
-            // Uncomment to get SL compatibility!
-            //
-            // ScriptSleep(delay);
-        }
-
         protected virtual void ScriptSleep(int delay)
         {
             delay = (int)((float)delay * m_ScriptDelayFactor);
@@ -1686,7 +1679,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             SetTexture(m_host, texture, face);
-            ConditionalScriptSleep(200);
+            ScriptSleep(200);
         }
 
         public void llSetLinkTexture(int linknumber, string texture, int face)
@@ -1698,7 +1691,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             foreach (SceneObjectPart part in parts)
               SetTexture(part, texture, face);
 
-            ConditionalScriptSleep(200);
+            ScriptSleep(200);
         }
 
         protected void SetTexture(SceneObjectPart part, string texture, int face)
@@ -1743,7 +1736,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             ScaleTexture(m_host, u, v, face);
-            ConditionalScriptSleep(200);
+            ScriptSleep(200);
         }
 
         protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
@@ -1779,7 +1772,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             OffsetTexture(m_host, u, v, face);
-            ConditionalScriptSleep(200);
+            ScriptSleep(200);
         }
 
         protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
@@ -1815,7 +1808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             RotateTexture(m_host, rotation, face);
-            ConditionalScriptSleep(200);
+            ScriptSleep(200);
         }
 
         protected void RotateTexture(SceneObjectPart part, double rotation, int face)
@@ -2289,7 +2282,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             m_host.PreloadSound(sound);
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
         }
 
         /// <summary>
@@ -2581,28 +2574,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeExplosion");
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeFountain");
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeSmoke");
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeFire");
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@@ -2661,7 +2654,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
                     ScriptSleep((int)((groupmass * velmag) / 10));
-                    ConditionalScriptSleep(100);
+                    ScriptSleep(100);
                     return;
                 }
             }
@@ -2881,7 +2874,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            return m_host.ObjectOwner.ToString();
+            return m_host.OwnerID.ToString();
         }
 
         public void llInstantMessage(string user, string message)
@@ -2947,7 +2940,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             emailModule.SendEmail(m_host.UUID, address, subject, message);
-            ConditionalScriptSleep(20000);
+            ScriptSleep(20000);
         }
 
         public void llGetNextEmail(string address, string subject)
@@ -3751,7 +3744,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // destination is an object
                 World.MoveTaskInventoryItem(destId, m_host, objId);
             }
-            ConditionalScriptSleep(3000);
+            ScriptSleep(3000);
         }
 
         public void llRemoveInventory(string name)
@@ -3852,7 +3845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             AsyncCommands.
             DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
             return tid.ToString();
         }
 
@@ -3890,11 +3883,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                              reply);
                         });
 
-                    ConditionalScriptSleep(1000);
+                    ScriptSleep(1000);
                     return tid.ToString();
                 }
             }
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
             return String.Empty;
         }
 
@@ -3922,7 +3915,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ConditionalScriptSleep(5000);
+            ScriptSleep(5000);
         }
 
         public void llTextBox(string avatar, string message, int chat_channel)
@@ -4666,7 +4659,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return 0;
             }
@@ -4691,7 +4684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return 0.0;
             }
@@ -4718,7 +4711,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return String.Empty;
             }
@@ -4732,7 +4725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return "";
             }
@@ -4746,7 +4739,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return new LSL_Vector(0, 0, 0);
             }
@@ -4767,7 +4760,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 index = src.Length + index;
             }
-            if (index >= src.Length)
+            if (index >= src.Length || index < 0)
             {
                 return new LSL_Rotation(0, 0, 0, 1);
             }
@@ -5382,7 +5375,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             m_host.AdjustSoundGain(volume);
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llSetSoundQueueing(int queue)
@@ -5465,7 +5458,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         World.TeleportClientHome(agentId, presence.ControllingClient);
                 }
             }
-            ConditionalScriptSleep(5000);
+            ScriptSleep(5000);
         }
 
         public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
@@ -5640,7 +5633,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y);
                         if (parcel != null)
                         {
-                            if (m_host.ObjectOwner == parcel.LandData.OwnerID ||
+                            if (m_host.OwnerID == parcel.LandData.OwnerID ||
                                 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.LandData.GroupID
                                 && parcel.LandData.IsGroupOwned) || World.Permissions.IsGod(m_host.OwnerID))
                             {
@@ -5850,7 +5843,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 for (int i = 0; i < rules.Length; i += 2)
                 {
-                    switch ((int)rules.Data[i])
+                    switch (Convert.ToInt32(rules.Data[i]))
                     {
                         case (int)ScriptBaseClass.PSYS_PART_FLAGS:
                             prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);
@@ -6157,7 +6150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     land.ParcelAccessList.Add(entry);
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llSetTouchText(string text)
@@ -6254,7 +6247,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 av, m_host.Name, m_host.UUID, m_host.OwnerID,
                 message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts);
 
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
         }
 
         public void llVolumeDetect(int detect)
@@ -6279,7 +6272,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             // Report an error as it does in SL
             ShoutError("Deprecated. Please use llRemoteLoadScriptPin instead.");
-            ConditionalScriptSleep(3000);
+            ScriptSleep(3000);
         }
 
         public void llSetRemoteScriptAccessPin(int pin)
@@ -6365,14 +6358,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams("remote_data", resobj,
                                                                          new DetectParams[0]));
             }
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
         }
 
         public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata)
         {
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
-            ConditionalScriptSleep(3000);
+            ScriptSleep(3000);
             return (xmlrpcMod.SendRemoteData(m_localID, m_itemID, channel, dest, idata, sdata)).ToString();
         }
 
@@ -6381,7 +6374,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata);
-            ConditionalScriptSleep(3000);
+            ScriptSleep(3000);
         }
 
         public void llCloseRemoteDataChannel(string channel)
@@ -6389,7 +6382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             xmlrpcMod.CloseXMLRPCChannel((UUID)channel);
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
         }
 
         public LSL_String llMD5String(string src, int nonce)
@@ -7117,7 +7110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             Deprecated("llXorBase64Strings");
-            ConditionalScriptSleep(300);
+            ScriptSleep(300);
             return String.Empty;
         }
 
@@ -7160,12 +7153,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
 
-            if (land.LandData.OwnerID != m_host.ObjectOwner)
+            if (land.LandData.OwnerID != m_host.OwnerID)
                 return;
 
             land.SetMusicUrl(url);
 
-            ConditionalScriptSleep(2000);
+            ScriptSleep(2000);
         }
 
         public LSL_Vector llGetRootPosition()
@@ -7218,7 +7211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llGetCreator()
         {
             m_host.AddScriptLPS(1);
-            return m_host.ObjectCreator.ToString();
+            return m_host.CreatorID.ToString();
         }
 
         public LSL_String llGetTimestamp()
@@ -8210,7 +8203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case 5: // DATA_SIM_POS
                         if (info == null)
                         {
-                            ConditionalScriptSleep(1000);
+                            ScriptSleep(1000);
                             return UUID.Zero.ToString();
                         }
                         reply = new LSL_Vector(
@@ -8227,7 +8220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case 7: // DATA_SIM_RATING
                         if (info == null)
                         {
-                            ConditionalScriptSleep(1000);
+                            ScriptSleep(1000);
                             return UUID.Zero.ToString();
                         }
                         int access = info.Maturity;
@@ -8246,7 +8239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         reply = "OpenSim";
                         break;
                     default:
-                        ConditionalScriptSleep(1000);
+                        ScriptSleep(1000);
                         return UUID.Zero.ToString(); // Raise no event
                 }
                 UUID rq = UUID.Random();
@@ -8257,7 +8250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.
                     DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
-                ConditionalScriptSleep(1000);
+                ScriptSleep(1000);
                 return tid.ToString();
             }
             catch(Exception)
@@ -8399,9 +8392,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
             if (null != dm)
                 dm.SendUrlToUser(
-                    new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url);
+                    new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url);
 
-            ConditionalScriptSleep(10000);
+            ScriptSleep(10000);
         }
 
         public void llParcelMediaCommandList(LSL_List commandList)
@@ -8414,7 +8407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // according to the docs, this command only works if script owner and land owner are the same
             // lets add estate owners and gods, too, and use the generic permission check.
             ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
-            if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return;
+            if (!World.Permissions.CanEditParcel(m_host.OwnerID, landObject)) return;
 
             bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)?
             byte loop = 0;
@@ -8637,7 +8630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                                       time);
                 }
             }
-            ConditionalScriptSleep(2000);
+            ScriptSleep(2000);
         }
 
         public LSL_List llParcelMediaQuery(LSL_List aList)
@@ -8675,7 +8668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 }
             }
-            ConditionalScriptSleep(2000);
+            ScriptSleep(2000);
             return list;
         }
 
@@ -8684,7 +8677,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             Int64 tmp = 0;
             Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp);
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
             return Convert.ToInt32(tmp);
         }
 
@@ -8788,7 +8781,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetPrimURL(string url)
         {
             m_host.AddScriptLPS(1);
-            ConditionalScriptSleep(2000);
+            ScriptSleep(2000);
         }
 
         /// <summary>
@@ -8799,7 +8792,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             ShoutError("llRefreshPrimURL - not yet supported");
-            ConditionalScriptSleep(20000);
+            ScriptSleep(20000);
         }
 
         public LSL_String llEscapeURL(string url)
@@ -8841,7 +8834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                                    new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
                                                                    new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
             }
-            ConditionalScriptSleep(1000);
+            ScriptSleep(1000);
         }
 
         public void llAddToLandBanList(string avatar, double hours)
@@ -8860,7 +8853,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     land.ParcelAccessList.Add(entry);
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llRemoveFromLandPassList(string avatar)
@@ -8882,7 +8875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llRemoveFromLandBanList(string avatar)
@@ -8904,7 +8897,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llSetCameraParams(LSL_List rules)
@@ -9084,9 +9077,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Vector3 velocity = m_host.Velocity;
             Quaternion rotation = m_host.RotationOffset;
             string ownerName = String.Empty;
-            ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
+            ScenePresence scenePresence = World.GetScenePresence(m_host.OwnerID);
             if (scenePresence == null)
-                ownerName = resolveName(m_host.ObjectOwner);
+                ownerName = resolveName(m_host.OwnerID);
             else
                 ownerName = scenePresence.Name;
 
@@ -9111,7 +9104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z);
             httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W);
             httpHeaders["X-SecondLife-Owner-Name"] = ownerName;
-            httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString();
+            httpHeaders["X-SecondLife-Owner-Key"] = m_host.OwnerID.ToString();
             string userAgent = config.Configs["Network"].GetString("user_agent", null);
             if (userAgent != null)
                 httpHeaders["User-Agent"] = userAgent;
@@ -9166,7 +9159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public void llResetLandPassList()
@@ -9183,7 +9176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
         }
 
         public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide)
@@ -9262,7 +9255,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     ret.Add(detectedParams.Value);
                 }
             }
-            ConditionalScriptSleep(2000);
+            ScriptSleep(2000);
             return ret;
         }
 
@@ -9520,7 +9513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.
                 DataserverPlugin.DataserverReply(assetID.ToString(),
                 NotecardCache.GetLines(assetID).ToString());
-                ConditionalScriptSleep(100);
+                ScriptSleep(100);
                 return tid.ToString();
             }
 
@@ -9542,7 +9535,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         NotecardCache.GetLines(id).ToString());
             });
 
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
             return tid.ToString();
         }
 
@@ -9581,7 +9574,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 AsyncCommands.DataserverPlugin.DataserverReply(assetID.ToString(),
                                                                NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
-                ConditionalScriptSleep(100);
+                ScriptSleep(100);
                 return tid.ToString();
             }
 
@@ -9602,7 +9595,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                                             NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax));
                          });
 
-            ConditionalScriptSleep(100);
+            ScriptSleep(100);
             return tid.ToString();
         }
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 4cb4b61..52396b6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ILandObject land
                 = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
 
-            if (land.LandData.OwnerID != m_host.ObjectOwner)
+            if (land.LandData.OwnerID != m_host.OwnerID)
                 return;
 
             land.SetMediaUrl(url);
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ILandObject land
                 = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
 
-            if (land.LandData.OwnerID != m_host.ObjectOwner)
+            if (land.LandData.OwnerID != m_host.OwnerID)
             {
                 OSSLError("osSetParcelSIPAddress: Sorry, you need to own the land to use this function");
                 return;
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 2842f6b..3f38bb6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1975,7 +1975,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public override int GetHashCode()
             {
-                return Convert.ToInt32(value);
+                return value.GetHashCode();
             }
 
 
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 5c838c5..0f642b9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -592,13 +592,11 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
-                                           uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        public virtual void SendAvatarData(SendAvatarData data)
         {
         }
 
-        public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid)
+        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
         {
         }
 
@@ -614,27 +612,15 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material)
+        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
         {
         }
-        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
-                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
-                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
-                                                  UUID objectID, UUID ownerID, string text, byte[] color,
-                                                  uint parentID,
-                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
-                                                  bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+
+        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
         {
         }
-        public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
-                                                Vector3 position, Quaternion rotation, Vector3 velocity,
-                                                Vector3 rotationalvelocity, byte state, UUID AssetId,
-                                                UUID ownerID, int attachPoint)
+
+        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
         {
         }