229 files changed, 7654 insertions, 3374 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 45b8d6f..0065702 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -122,9 +122,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                             Thread.CurrentThread.ManagedThreadId.ToString() +
                             ")");
                 
-                m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+                bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
-                regionsToLoad[i].EstateSettings.Save();
+                if (changed)
+                  regionsToLoad[i].EstateSettings.Save();
                 
                 if (scene != null)
                 {
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
index 0ba8931..5bab52f 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
@@ -63,7 +63,8 @@ namespace OpenSim.Capabilities.Handlers
 
             FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
             IRequestHandler reqHandler
-                = new RestStreamHandler("POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest);
+                = new RestStreamHandler(
+                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
             server.AddStreamHandler(reqHandler);
         }
     }
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
index 2ecfa3c..8a275f3 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -66,13 +66,14 @@ namespace OpenSim.Capabilities.Handlers
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
-                                                       });
+            IRequestHandler reqHandler
+                = new RestHTTPHandler(
+                    "GET",
+                    "/CAPS/" + UUID.Random(),
+                    httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
+                    "GetMesh",
+                    null);
             server.AddStreamHandler(reqHandler);
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 217217e..abdbc72 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -58,8 +58,8 @@ namespace OpenSim.Capabilities.Handlers
         // TODO: Change this to a config option
         const string REDIRECT_URL = null;
 
-        public GetTextureHandler(string path, IAssetService assService) :
-                base("GET", path)
+        public GetTextureHandler(string path, IAssetService assService, string name, string description)
+            : base("GET", path, name, description)
         {
             m_assetService = assService;
         }
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
index 0d072f7..71cf033 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
@@ -62,8 +62,8 @@ namespace OpenSim.Capabilities.Handlers
             if (m_AssetService == null)
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
-            server.AddStreamHandler(new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService));
+            server.AddStreamHandler(
+                new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null));
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
index fd152c3..761e4e7 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
@@ -50,9 +50,9 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             TestHelpers.InMethod();
 
             // Overkill - we only really need the asset service, not a whole scene.
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
 
-            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService);
+            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService, "TestGetTexture", null);
             TestOSHttpRequest req = new TestOSHttpRequest();
             TestOSHttpResponse resp = new TestOSHttpResponse();
             req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 594ce9d..8849a59 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -85,8 +85,8 @@ namespace OpenSim.Capabilities.Handlers
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
-                        new BinaryStreamHandler("POST", capsBase + uploaderPath,
-                        uploader.uploaderCaps));
+                    new BinaryStreamHandler(
+                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
 
                 string protocol = "http://";
 
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs
index 92eeb14..5d86557 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs
@@ -68,7 +68,13 @@ namespace OpenSim.Capabilities.Handlers
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
             WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
-            IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, webFetchHandler.FetchInventoryDescendentsRequest);
+            IRequestHandler reqHandler
+                = new RestStreamHandler(
+                    "POST",
+                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
+                    webFetchHandler.FetchInventoryDescendentsRequest,
+                    "WebFetchInvDesc",
+                    null);
             server.AddStreamHandler(reqHandler);
         }
 
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs
index c7c1fc9..f5c728c 100644
--- a/OpenSim/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Capabilities/LLSDStreamHandler.cs
@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public LLSDStreamhandler(
+            string httpMethod, string path, LLSDMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index a22dc0a..20df234 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -163,54 +163,53 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    MySqlCommand cmd =
+                    using (MySqlCommand cmd =
                         new MySqlCommand(
                             "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
                             "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)",
-                            dbcon);
-
-                    string assetName = asset.Name;
-                    if (asset.Name.Length > 64)
-                    {
-                        assetName = asset.Name.Substring(0, 64);
-                        m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
-                    }
-
-                    string assetDescription = asset.Description;
-                    if (asset.Description.Length > 64)
-                    {
-                        assetDescription = asset.Description.Substring(0, 64);
-                        m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                    }
-
-                    // need to ensure we dispose
-                    try
+                            dbcon))
                     {
-                        using (cmd)
+                        string assetName = asset.Name;
+                        if (asset.Name.Length > 64)
                         {
-                            // create unix epoch time
-                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                            cmd.Parameters.AddWithValue("?id", asset.ID);
-                            cmd.Parameters.AddWithValue("?name", assetName);
-                            cmd.Parameters.AddWithValue("?description", assetDescription);
-                            cmd.Parameters.AddWithValue("?assetType", asset.Type);
-                            cmd.Parameters.AddWithValue("?local", asset.Local);
-                            cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                            cmd.Parameters.AddWithValue("?create_time", now);
-                            cmd.Parameters.AddWithValue("?access_time", now);
-                            cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                            cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                            cmd.Parameters.AddWithValue("?data", asset.Data);
-                            cmd.ExecuteNonQuery();
-                            cmd.Dispose();
-                            return true;
+                            assetName = asset.Name.Substring(0, 64);
+                            m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                        }
+    
+                        string assetDescription = asset.Description;
+                        if (asset.Description.Length > 64)
+                        {
+                            assetDescription = asset.Description.Substring(0, 64);
+                            m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                        }
+    
+                        try
+                        {
+                            using (cmd)
+                            {
+                                // create unix epoch time
+                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                                cmd.Parameters.AddWithValue("?id", asset.ID);
+                                cmd.Parameters.AddWithValue("?name", assetName);
+                                cmd.Parameters.AddWithValue("?description", assetDescription);
+                                cmd.Parameters.AddWithValue("?assetType", asset.Type);
+                                cmd.Parameters.AddWithValue("?local", asset.Local);
+                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
+                                cmd.Parameters.AddWithValue("?create_time", now);
+                                cmd.Parameters.AddWithValue("?access_time", now);
+                                cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
+                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
+                                cmd.Parameters.AddWithValue("?data", asset.Data);
+                                cmd.ExecuteNonQuery();
+                                return true;
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                                asset.FullID, asset.Name, e.Message);
+                            return false;
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                            asset.FullID, asset.Name, e.Message);
-                        return false;
                     }
                 }
             }
@@ -223,33 +222,31 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    MySqlCommand cmd =
-                        new MySqlCommand("update assets set access_time=?access_time where id=?id",
-                                         dbcon);
 
-                    // need to ensure we dispose
-                    try
+                    using (MySqlCommand cmd
+                        = new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon))
                     {
-                        using (cmd)
+                        try
                         {
-                            // create unix epoch time
-                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                            cmd.Parameters.AddWithValue("?id", asset.ID);
-                            cmd.Parameters.AddWithValue("?access_time", now);
-                            cmd.ExecuteNonQuery();
-                            cmd.Dispose();
+                            using (cmd)
+                            {
+                                // create unix epoch time
+                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                                cmd.Parameters.AddWithValue("?id", asset.ID);
+                                cmd.Parameters.AddWithValue("?access_time", now);
+                                cmd.ExecuteNonQuery();
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ASSETS DB]: " +
+                                "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
+                                + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat(
-                            "[ASSETS DB]: " +
-                            "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-                            + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
                     }
                 }
             }
-
         }
 
         /// <summary>
@@ -312,35 +309,41 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count", dbcon);
-                    cmd.Parameters.AddWithValue("?start", start);
-                    cmd.Parameters.AddWithValue("?count", count);
 
-                    try
+                    using (MySqlCommand cmd
+                        = new MySqlCommand(
+                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
+                            dbcon))
                     {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                        cmd.Parameters.AddWithValue("?start", start);
+                        cmd.Parameters.AddWithValue("?count", count);
+    
+                        try
                         {
-                            while (dbReader.Read())
+                            using (MySqlDataReader dbReader = cmd.ExecuteReader())
                             {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = (sbyte)dbReader["assetType"];
-                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
-                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                metadata.CreatorID = dbReader["CreatorID"].ToString();
-
-                                // Current SHA1s are not stored/computed.
-                                metadata.SHA1 = new byte[] { };
-
-                                retList.Add(metadata);
+                                while (dbReader.Read())
+                                {
+                                    AssetMetadata metadata = new AssetMetadata();
+                                    metadata.Name = (string)dbReader["name"];
+                                    metadata.Description = (string)dbReader["description"];
+                                    metadata.Type = (sbyte)dbReader["assetType"];
+                                    metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
+                                    metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                    metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                    metadata.CreatorID = dbReader["CreatorID"].ToString();
+    
+                                    // Current SHA1s are not stored/computed.
+                                    metadata.SHA1 = new byte[] { };
+    
+                                    retList.Add(metadata);
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                        catch (Exception e)
+                        {
+                            m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                        }
                     }
                 }
             }
@@ -355,11 +358,12 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon);
-                    cmd.Parameters.AddWithValue("?id", id);
-                    cmd.ExecuteNonQuery();
 
-                    cmd.Dispose();
+                    using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?id", id);
+                        cmd.ExecuteNonQuery();
+                    }
                 }
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index 8d82f61..7627497 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -70,99 +70,106 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-                MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon);
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-
-                IDataReader result = cmd.ExecuteReader();
 
-                if (result.Read())
+                using (MySqlCommand cmd
+                    = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon))
                 {
-                    ret.PrincipalID = principalID;
+                    cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                    if (m_ColumnNames == null)
+                    IDataReader result = cmd.ExecuteReader();
+    
+                    if (result.Read())
                     {
-                        m_ColumnNames = new List<string>();
-
-                        DataTable schemaTable = result.GetSchemaTable();
-                        foreach (DataRow row in schemaTable.Rows)
-                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                        ret.PrincipalID = principalID;
+    
+                        CheckColumnNames(result);
+    
+                        foreach (string s in m_ColumnNames)
+                        {
+                            if (s == "UUID")
+                                continue;
+    
+                            ret.Data[s] = result[s].ToString();
+                        }
+    
+                        return ret;
                     }
-
-                    foreach (string s in m_ColumnNames)
+                    else
                     {
-                        if (s == "UUID")
-                            continue;
-
-                        ret.Data[s] = result[s].ToString();
+                        return null;
                     }
-
-                    return ret;
-                }
-                else
-                {
-                    return null;
                 }
             }
         }
 
-        public bool Store(AuthenticationData data)
+        private void CheckColumnNames(IDataReader result)
         {
-            if (data.Data.ContainsKey("UUID"))
-                data.Data.Remove("UUID");
+            if (m_ColumnNames != null)
+                return;
 
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
-
-            MySqlCommand cmd = new MySqlCommand();
+            List<string> columnNames = new List<string>();
 
-            string update = "update `"+m_Realm+"` set ";
-            bool first = true;
-            foreach (string field in fields)
-            {
-                if (!first)
-                    update += ", ";
-                update += "`" + field + "` = ?"+field;
+            DataTable schemaTable = result.GetSchemaTable();
+            foreach (DataRow row in schemaTable.Rows)
+                columnNames.Add(row["ColumnName"].ToString());
 
-                first = false;
-
-                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
-            }
+            m_ColumnNames = columnNames;
+        }
 
-            update += " where UUID = ?principalID";
+        public bool Store(AuthenticationData data)
+        {
+            if (data.Data.ContainsKey("UUID"))
+                data.Data.Remove("UUID");
 
-            cmd.CommandText = update;
-            cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            if (ExecuteNonQuery(cmd) < 1)
+            using (MySqlCommand cmd = new MySqlCommand())
             {
-                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
-                        String.Join("`, `", fields) +
-                        "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
-
-                cmd.CommandText = insert;
-
+                string update = "update `"+m_Realm+"` set ";
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        update += ", ";
+                    update += "`" + field + "` = ?"+field;
+    
+                    first = false;
+    
+                    cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
+                }
+    
+                update += " where UUID = ?principalID";
+    
+                cmd.CommandText = update;
+                cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
+    
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    cmd.Dispose();
-                    return false;
+                    string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                            String.Join("`, `", fields) +
+                            "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
+    
+                    cmd.CommandText = insert;
+    
+                    if (ExecuteNonQuery(cmd) < 1)
+                        return false;
                 }
             }
 
-            cmd.Dispose();
-
             return true;
         }
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
-                    "` set `" + item + "` = ?" + item + " where UUID = ?UUID");
-
-
-            cmd.Parameters.AddWithValue("?"+item, value);
-            cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+            using (MySqlCommand cmd
+                = new MySqlCommand("update `" + m_Realm + "` set `" + item + "` = ?" + item + " where UUID = ?UUID"))
+            {
+                cmd.Parameters.AddWithValue("?"+item, value);
+                cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
+    
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
@@ -172,18 +179,18 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            MySqlCommand cmd = new MySqlCommand("insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))");
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?token", token);
-            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-
-            if (ExecuteNonQuery(cmd) > 0)
+            using (MySqlCommand cmd
+                = new MySqlCommand(
+                    "insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))"))
             {
-                cmd.Dispose();
-                return true;
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                cmd.Parameters.AddWithValue("?token", token);
+                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+    
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
             }
 
-            cmd.Dispose();
             return false;
         }
 
@@ -192,30 +199,29 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            MySqlCommand cmd = new MySqlCommand("update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()");
-            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?token", token);
-            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-
-            if (ExecuteNonQuery(cmd) > 0)
+            using (MySqlCommand cmd
+                = new MySqlCommand(
+                    "update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()"))
             {
-                cmd.Dispose();
-                return true;
-            }
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                cmd.Parameters.AddWithValue("?token", token);
+                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
 
-            cmd.Dispose();
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
 
         private void DoExpire()
         {
-            MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()");
-            ExecuteNonQuery(cmd);
-
-            cmd.Dispose();
+            using (MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()"))
+            {
+                ExecuteNonQuery(cmd);
+            }
 
             m_LastExpire = System.Environment.TickCount;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
index 8c841ab..6a2f5d8 100644
--- a/OpenSim/Data/MySQL/MySQLAvatarData.cs
+++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -52,14 +52,15 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(UUID principalID, string name)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
-            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?Name", name);
-
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
+                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+                cmd.Parameters.AddWithValue("?Name", name);
+    
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+            }
 
             return false;
         }
diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs
index 130ba5e..3cd6b8f 100644
--- a/OpenSim/Data/MySQL/MySQLFriendsData.cs
+++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs
@@ -49,34 +49,38 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(string principalID, string friend)
         {
-            MySqlCommand cmd = new MySqlCommand();
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
+                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+                cmd.Parameters.AddWithValue("?Friend", friend);
 
-            cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
-            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
-            cmd.Parameters.AddWithValue("?Friend", friend);
-
-            ExecuteNonQuery(cmd);
+                ExecuteNonQuery(cmd);
+            }
 
             return true;
         }
 
         public FriendsData[] GetFriends(UUID principalID)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
-            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
+                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
 
-            return DoQuery(cmd);
+                return DoQuery(cmd);
+            }
         }
 
         public FriendsData[] GetFriends(string principalID)
         {
-            MySqlCommand cmd = new MySqlCommand();
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID LIKE ?PrincipalID", m_Realm);
+                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
 
-            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID LIKE ?PrincipalID", m_Realm);
-            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
-            return DoQuery(cmd);
+                return DoQuery(cmd);
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 786b955..86367a1 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -91,15 +91,17 @@ namespace OpenSim.Data.MySQL
             if (m_ColumnNames != null)
                 return;
 
-            m_ColumnNames = new List<string>();
+            List<string> columnNames = new List<string>();
 
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
                 if (row["ColumnName"] != null &&
                         (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
-                    m_ColumnNames.Add(row["ColumnName"].ToString());
+                    columnNames.Add(row["ColumnName"].ToString());
             }
+
+            m_ColumnNames = columnNames;
         }
 
         public virtual T[] Get(string field, string key)
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 1a634e5..e9b10f3 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -467,43 +467,43 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    MySqlCommand result = new MySqlCommand(sql, dbcon);
-                    result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
-                    result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
-                    result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
-                    result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
-                    result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
-                    result.Parameters.AddWithValue("?inventoryName", itemName);
-                    result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
-                    result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
-                    result.Parameters.AddWithValue("?inventoryCurrentPermissions",
-                                                   item.CurrentPermissions.ToString());
-                    result.Parameters.AddWithValue("?invType", item.InvType);
-                    result.Parameters.AddWithValue("?creatorID", item.CreatorId);
-                    result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
-                    result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
-                    result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
-                    result.Parameters.AddWithValue("?salePrice", item.SalePrice);
-                    result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
-                    result.Parameters.AddWithValue("?creationDate", item.CreationDate);
-                    result.Parameters.AddWithValue("?groupID", item.GroupID);
-                    result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
-                    result.Parameters.AddWithValue("?flags", item.Flags);
-
-                    lock (m_dbLock)
+                    using (MySqlCommand result = new MySqlCommand(sql, dbcon))
                     {
-                        result.ExecuteNonQuery();
+                        result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
+                        result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
+                        result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
+                        result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
+                        result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
+                        result.Parameters.AddWithValue("?inventoryName", itemName);
+                        result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
+                        result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
+                        result.Parameters.AddWithValue("?inventoryCurrentPermissions",
+                                                       item.CurrentPermissions.ToString());
+                        result.Parameters.AddWithValue("?invType", item.InvType);
+                        result.Parameters.AddWithValue("?creatorID", item.CreatorId);
+                        result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
+                        result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
+                        result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
+                        result.Parameters.AddWithValue("?salePrice", item.SalePrice);
+                        result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
+                        result.Parameters.AddWithValue("?creationDate", item.CreationDate);
+                        result.Parameters.AddWithValue("?groupID", item.GroupID);
+                        result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
+                        result.Parameters.AddWithValue("?flags", item.Flags);
+    
+                        lock (m_dbLock)
+                            result.ExecuteNonQuery();
+    
+                        result.Dispose();
                     }
 
-                    result.Dispose();
-
-                    result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon);
-                    result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
-                    lock (m_dbLock)
+                    using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon))
                     {
-                        result.ExecuteNonQuery();
+                        result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+
+                        lock (m_dbLock)
+                            result.ExecuteNonQuery();
                     }
-                    result.Dispose();
                 }
             }
             catch (MySqlException e)
@@ -533,12 +533,12 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon);
-                    cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
-
-                    lock (m_dbLock)
+                    using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon))
                     {
-                        cmd.ExecuteNonQuery();
+                        cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
+
+                        lock (m_dbLock)
+                            cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -579,24 +579,26 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
-                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
-                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-                cmd.Parameters.AddWithValue("?folderName", folderName);
-                cmd.Parameters.AddWithValue("?type", folder.Type);
-                cmd.Parameters.AddWithValue("?version", folder.Version);
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
                 {
-                    lock (m_dbLock)
+                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                    cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
+                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+                    cmd.Parameters.AddWithValue("?folderName", folderName);
+                    cmd.Parameters.AddWithValue("?type", folder.Type);
+                    cmd.Parameters.AddWithValue("?version", folder.Version);
+
+                    try
                     {
-                        cmd.ExecuteNonQuery();
+                        lock (m_dbLock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(e.ToString());
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.ToString());
                 }
             }
         }
@@ -624,20 +626,22 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
-                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
                 {
-                    lock (m_dbLock)
+                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+    
+                    try
                     {
-                        cmd.ExecuteNonQuery();
+                        lock (m_dbLock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(e.ToString());
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.ToString());
                 }
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index fc625f0..7808060 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -63,13 +63,14 @@ namespace OpenSim.Data.MySQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-
-            ExecuteNonQuery(cmd);
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
+    
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+    
+                ExecuteNonQuery(cmd);
+            }
         }
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
@@ -81,17 +82,18 @@ namespace OpenSim.Data.MySQL
             if (regionID == UUID.Zero)
                 return false;
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
-            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-
-            if (ExecuteNonQuery(cmd) == 0)
-                return false;
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
+    
+                cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+    
+                if (ExecuteNonQuery(cmd) == 0)
+                    return false;
+            }
 
             return true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index c20c392..0614879 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -162,17 +162,7 @@ namespace OpenSim.Data.MySQL
                         ret.sizeX = Convert.ToInt32(result["sizeX"]);
                         ret.sizeY = Convert.ToInt32(result["sizeY"]);
 
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
-
-                            DataTable schemaTable = result.GetSchemaTable();
-                            foreach (DataRow row in schemaTable.Rows)
-                            {
-                                if (row["ColumnName"] != null)
-                                    m_ColumnNames.Add(row["ColumnName"].ToString());
-                            }
-                        }
+                        CheckColumnNames(result);
 
                         foreach (string s in m_ColumnNames)
                         {
@@ -187,7 +177,11 @@ namespace OpenSim.Data.MySQL
                             if (s == "locY")
                                 continue;
 
-                            ret.Data[s] = result[s].ToString();
+                            object value = result[s];
+                            if (value is DBNull)
+                                ret.Data[s] = null;
+                            else
+                                ret.Data[s] = result[s].ToString();
                         }
 
                         retList.Add(ret);
@@ -198,6 +192,23 @@ namespace OpenSim.Data.MySQL
             return retList;
         }
 
+        private void CheckColumnNames(IDataReader result)
+        {
+            if (m_ColumnNames != null)
+                return;
+
+            List<string> columnNames = new List<string>();
+
+            DataTable schemaTable = result.GetSchemaTable();
+            foreach (DataRow row in schemaTable.Rows)
+            {
+                if (row["ColumnName"] != null)
+                    columnNames.Add(row["ColumnName"].ToString());
+            }
+
+            m_ColumnNames = columnNames;
+        }
+
         public bool Store(RegionData data)
         {
             if (data.Data.ContainsKey("uuid"))
@@ -318,11 +329,12 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-
-            return RunCommand(cmd);
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+    
+                return RunCommand(cmd);
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index ec7a454..9467124 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -129,120 +129,120 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    MySqlCommand cmd = dbcon.CreateCommand();
 
-                    foreach (SceneObjectPart prim in obj.Parts)
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
-                        cmd.Parameters.Clear();
+                        foreach (SceneObjectPart prim in obj.Parts)
+                        {
+                            cmd.Parameters.Clear();
 
-                        cmd.CommandText = "replace into prims (" +
-                                "UUID, CreationDate, " +
-                                "Name, Text, Description, " +
-                                "SitName, TouchName, ObjectFlags, " +
-                                "OwnerMask, NextOwnerMask, GroupMask, " +
-                                "EveryoneMask, BaseMask, PositionX, " +
-                                "PositionY, PositionZ, GroupPositionX, " +
-                                "GroupPositionY, GroupPositionZ, VelocityX, " +
-                                "VelocityY, VelocityZ, AngularVelocityX, " +
-                                "AngularVelocityY, AngularVelocityZ, " +
-                                "AccelerationX, AccelerationY, " +
-                                "AccelerationZ, RotationX, " +
-                                "RotationY, RotationZ, " +
-                                "RotationW, SitTargetOffsetX, " +
-                                "SitTargetOffsetY, SitTargetOffsetZ, " +
-                                "SitTargetOrientW, SitTargetOrientX, " +
-                                "SitTargetOrientY, SitTargetOrientZ, " +
-                                "RegionUUID, CreatorID, " +
-                                "OwnerID, GroupID, " +
-                                "LastOwnerID, SceneGroupID, " +
-                                "PayPrice, PayButton1, " +
-                                "PayButton2, PayButton3, " +
-                                "PayButton4, LoopedSound, " +
-                                "LoopedSoundGain, TextureAnimation, " +
-                                "OmegaX, OmegaY, OmegaZ, " +
-                                "CameraEyeOffsetX, CameraEyeOffsetY, " +
-                                "CameraEyeOffsetZ, CameraAtOffsetX, " +
-                                "CameraAtOffsetY, CameraAtOffsetZ, " +
-                                "ForceMouselook, ScriptAccessPin, " +
-                                "AllowedDrop, DieAtEdge, " +
-                                "SalePrice, SaleType, " +
-                                "ColorR, ColorG, ColorB, ColorA, " +
-                                "ParticleSystem, ClickAction, Material, " +
-                                "CollisionSound, CollisionSoundVolume, " +
-                                "PassTouches, " +
-                                "PassCollisions, " +
-                                "LinkNumber, MediaURL, KeyframeMotion, " +
-                                "PhysicsShapeType, Density, GravityModifier, " +
-                                "Friction, Restitution) values (" + "?UUID, " +
-                                "?CreationDate, ?Name, ?Text, " +
-                                "?Description, ?SitName, ?TouchName, " +
-                                "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
-                                "?GroupMask, ?EveryoneMask, ?BaseMask, " +
-                                "?PositionX, ?PositionY, ?PositionZ, " +
-                                "?GroupPositionX, ?GroupPositionY, " +
-                                "?GroupPositionZ, ?VelocityX, " +
-                                "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
-                                "?AngularVelocityY, ?AngularVelocityZ, " +
-                                "?AccelerationX, ?AccelerationY, " +
-                                "?AccelerationZ, ?RotationX, " +
-                                "?RotationY, ?RotationZ, " +
-                                "?RotationW, ?SitTargetOffsetX, " +
-                                "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
-                                "?SitTargetOrientW, ?SitTargetOrientX, " +
-                                "?SitTargetOrientY, ?SitTargetOrientZ, " +
-                                "?RegionUUID, ?CreatorID, ?OwnerID, " +
-                                "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
-                                "?PayPrice, ?PayButton1, ?PayButton2, " +
-                                "?PayButton3, ?PayButton4, ?LoopedSound, " +
-                                "?LoopedSoundGain, ?TextureAnimation, " +
-                                "?OmegaX, ?OmegaY, ?OmegaZ, " +
-                                "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
-                                "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
-                                "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
-                                "?ForceMouselook, ?ScriptAccessPin, " +
-                                "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
-                                "?SaleType, ?ColorR, ?ColorG, " +
-                                "?ColorB, ?ColorA, ?ParticleSystem, " +
-                                "?ClickAction, ?Material, ?CollisionSound, " +
-                                "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
-                                "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
-                                "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                "?Friction, ?Restitution)";
-
-                        FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
+                            cmd.CommandText = "replace into prims (" +
+                                    "UUID, CreationDate, " +
+                                    "Name, Text, Description, " +
+                                    "SitName, TouchName, ObjectFlags, " +
+                                    "OwnerMask, NextOwnerMask, GroupMask, " +
+                                    "EveryoneMask, BaseMask, PositionX, " +
+                                    "PositionY, PositionZ, GroupPositionX, " +
+                                    "GroupPositionY, GroupPositionZ, VelocityX, " +
+                                    "VelocityY, VelocityZ, AngularVelocityX, " +
+                                    "AngularVelocityY, AngularVelocityZ, " +
+                                    "AccelerationX, AccelerationY, " +
+                                    "AccelerationZ, RotationX, " +
+                                    "RotationY, RotationZ, " +
+                                    "RotationW, SitTargetOffsetX, " +
+                                    "SitTargetOffsetY, SitTargetOffsetZ, " +
+                                    "SitTargetOrientW, SitTargetOrientX, " +
+                                    "SitTargetOrientY, SitTargetOrientZ, " +
+                                    "RegionUUID, CreatorID, " +
+                                    "OwnerID, GroupID, " +
+                                    "LastOwnerID, SceneGroupID, " +
+                                    "PayPrice, PayButton1, " +
+                                    "PayButton2, PayButton3, " +
+                                    "PayButton4, LoopedSound, " +
+                                    "LoopedSoundGain, TextureAnimation, " +
+                                    "OmegaX, OmegaY, OmegaZ, " +
+                                    "CameraEyeOffsetX, CameraEyeOffsetY, " +
+                                    "CameraEyeOffsetZ, CameraAtOffsetX, " +
+                                    "CameraAtOffsetY, CameraAtOffsetZ, " +
+                                    "ForceMouselook, ScriptAccessPin, " +
+                                    "AllowedDrop, DieAtEdge, " +
+                                    "SalePrice, SaleType, " +
+                                    "ColorR, ColorG, ColorB, ColorA, " +
+                                    "ParticleSystem, ClickAction, Material, " +
+                                    "CollisionSound, CollisionSoundVolume, " +
+                                    "PassTouches, " +
+                                    "PassCollisions, " +
+                                    "LinkNumber, MediaURL, KeyframeMotion, " +
+                                    "PhysicsShapeType, Density, GravityModifier, " +
+                                    "Friction, Restitution) values (" + "?UUID, " +
+                                    "?CreationDate, ?Name, ?Text, " +
+                                    "?Description, ?SitName, ?TouchName, " +
+                                    "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
+                                    "?GroupMask, ?EveryoneMask, ?BaseMask, " +
+                                    "?PositionX, ?PositionY, ?PositionZ, " +
+                                    "?GroupPositionX, ?GroupPositionY, " +
+                                    "?GroupPositionZ, ?VelocityX, " +
+                                    "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
+                                    "?AngularVelocityY, ?AngularVelocityZ, " +
+                                    "?AccelerationX, ?AccelerationY, " +
+                                    "?AccelerationZ, ?RotationX, " +
+                                    "?RotationY, ?RotationZ, " +
+                                    "?RotationW, ?SitTargetOffsetX, " +
+                                    "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
+                                    "?SitTargetOrientW, ?SitTargetOrientX, " +
+                                    "?SitTargetOrientY, ?SitTargetOrientZ, " +
+                                    "?RegionUUID, ?CreatorID, ?OwnerID, " +
+                                    "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
+                                    "?PayPrice, ?PayButton1, ?PayButton2, " +
+                                    "?PayButton3, ?PayButton4, ?LoopedSound, " +
+                                    "?LoopedSoundGain, ?TextureAnimation, " +
+                                    "?OmegaX, ?OmegaY, ?OmegaZ, " +
+                                    "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
+                                    "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
+                                    "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
+                                    "?ForceMouselook, ?ScriptAccessPin, " +
+                                    "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
+                                    "?SaleType, ?ColorR, ?ColorG, " +
+                                    "?ColorB, ?ColorA, ?ParticleSystem, " +
+                                    "?ClickAction, ?Material, ?CollisionSound, " +
+                                    "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
+                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
+                                    "?PhysicsShapeType, ?Density, ?GravityModifier, " +
+                                    "?Friction, ?Restitution)";
+
+                            FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
-                        ExecuteNonQuery(cmd);
+                            ExecuteNonQuery(cmd);
 
-                        cmd.Parameters.Clear();
+                            cmd.Parameters.Clear();
 
-                        cmd.CommandText = "replace into primshapes (" +
-                                "UUID, Shape, ScaleX, ScaleY, " +
-                                "ScaleZ, PCode, PathBegin, PathEnd, " +
-                                "PathScaleX, PathScaleY, PathShearX, " +
-                                "PathShearY, PathSkew, PathCurve, " +
-                                "PathRadiusOffset, PathRevolutions, " +
-                                "PathTaperX, PathTaperY, PathTwist, " +
-                                "PathTwistBegin, ProfileBegin, ProfileEnd, " +
-                                "ProfileCurve, ProfileHollow, Texture, " +
-                                "ExtraParams, State, Media) values (?UUID, " +
-                                "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
-                                "?PCode, ?PathBegin, ?PathEnd, " +
-                                "?PathScaleX, ?PathScaleY, " +
-                                "?PathShearX, ?PathShearY, " +
-                                "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
-                                "?PathRevolutions, ?PathTaperX, " +
-                                "?PathTaperY, ?PathTwist, " +
-                                "?PathTwistBegin, ?ProfileBegin, " +
-                                "?ProfileEnd, ?ProfileCurve, " +
-                                "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                "?State, ?Media)";
-
-                        FillShapeCommand(cmd, prim);
+                            cmd.CommandText = "replace into primshapes (" +
+                                    "UUID, Shape, ScaleX, ScaleY, " +
+                                    "ScaleZ, PCode, PathBegin, PathEnd, " +
+                                    "PathScaleX, PathScaleY, PathShearX, " +
+                                    "PathShearY, PathSkew, PathCurve, " +
+                                    "PathRadiusOffset, PathRevolutions, " +
+                                    "PathTaperX, PathTaperY, PathTwist, " +
+                                    "PathTwistBegin, ProfileBegin, ProfileEnd, " +
+                                    "ProfileCurve, ProfileHollow, Texture, " +
+                                    "ExtraParams, State, Media) values (?UUID, " +
+                                    "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
+                                    "?PCode, ?PathBegin, ?PathEnd, " +
+                                    "?PathScaleX, ?PathScaleY, " +
+                                    "?PathShearX, ?PathShearY, " +
+                                    "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
+                                    "?PathRevolutions, ?PathTaperX, " +
+                                    "?PathTaperY, ?PathTwist, " +
+                                    "?PathTwistBegin, ?ProfileBegin, " +
+                                    "?ProfileEnd, ?ProfileCurve, " +
+                                    "?ProfileHollow, ?Texture, ?ExtraParams, " +
+                                    "?State, ?Media)";
+
+                            FillShapeCommand(cmd, prim);
 
-                        ExecuteNonQuery(cmd);
+                            ExecuteNonQuery(cmd);
+                        }
                     }
-                    
-                    cmd.Dispose();
                 }
             }
         }
@@ -1872,41 +1872,40 @@ namespace OpenSim.Data.MySQL
             {
                 RemoveItems(primID);
 
+                if (items.Count == 0)
+                    return;
+
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
 
-                    MySqlCommand cmd = dbcon.CreateCommand();
-
-                    if (items.Count == 0)
-                        return;
-
-                    cmd.CommandText = "insert into primitems (" +
-                            "invType, assetType, name, " +
-                            "description, creationDate, nextPermissions, " +
-                            "currentPermissions, basePermissions, " +
-                            "everyonePermissions, groupPermissions, " +
-                            "flags, itemID, primID, assetID, " +
-                            "parentFolderID, creatorID, ownerID, " +
-                            "groupID, lastOwnerID) values (?invType, " +
-                            "?assetType, ?name, ?description, " +
-                            "?creationDate, ?nextPermissions, " +
-                            "?currentPermissions, ?basePermissions, " +
-                            "?everyonePermissions, ?groupPermissions, " +
-                            "?flags, ?itemID, ?primID, ?assetID, " +
-                            "?parentFolderID, ?creatorID, ?ownerID, " +
-                            "?groupID, ?lastOwnerID)";
-
-                    foreach (TaskInventoryItem item in items)
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
-                        cmd.Parameters.Clear();
-
-                        FillItemCommand(cmd, item);
-
-                        ExecuteNonQuery(cmd);
+                        cmd.CommandText = "insert into primitems (" +
+                                "invType, assetType, name, " +
+                                "description, creationDate, nextPermissions, " +
+                                "currentPermissions, basePermissions, " +
+                                "everyonePermissions, groupPermissions, " +
+                                "flags, itemID, primID, assetID, " +
+                                "parentFolderID, creatorID, ownerID, " +
+                                "groupID, lastOwnerID) values (?invType, " +
+                                "?assetType, ?name, ?description, " +
+                                "?creationDate, ?nextPermissions, " +
+                                "?currentPermissions, ?basePermissions, " +
+                                "?everyonePermissions, ?groupPermissions, " +
+                                "?flags, ?itemID, ?primID, ?assetID, " +
+                                "?parentFolderID, ?creatorID, ?ownerID, " +
+                                "?groupID, ?lastOwnerID)";
+    
+                        foreach (TaskInventoryItem item in items)
+                        {
+                            cmd.Parameters.Clear();
+    
+                            FillItemCommand(cmd, item);
+    
+                            ExecuteNonQuery(cmd);
+                        }
                     }
-
-                    cmd.Dispose();
                 }
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index a18ac66..4ff3175 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -66,38 +66,40 @@ namespace OpenSim.Data.MySQL
             if (words.Length > 2)
                 return new UserAccountData[0];
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            if (words.Length == 1)
-            {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
-                cmd.Parameters.AddWithValue("?search", words[0] + "%");
-                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-            }
-            else
+            using (MySqlCommand cmd = new MySqlCommand())
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
-                cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
-                cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
-                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-            }
+                if (words.Length == 1)
+                {
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
+                    cmd.Parameters.AddWithValue("?search", words[0] + "%");
+                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+                }
+                else
+                {
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
+                    cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
+                    cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
+                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+                }
 
-            return DoQuery(cmd);
+                return DoQuery(cmd);
+            }
         }
 
         public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            if (scopeID != UUID.Zero)
+            using (MySqlCommand cmd = new MySqlCommand())
             {
-                where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
-                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-            }
+                if (scopeID != UUID.Zero)
+                {
+                    where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
+                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+                }
 
-            cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
+                cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
 
-            return DoQuery(cmd);
+                return DoQuery(cmd);
+            }
         }
     }
 }
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index c5d6b78..87bdacd 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -79,7 +79,11 @@ namespace OpenSim.Framework.Console
             public List<CommandDelegate> fn;
         }
 
-        public const string GeneralHelpText = "For more information, type 'help <item>' where <item> is one of the following categories:";
+        public const string GeneralHelpText
+            = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
+
+        public const string ItemHelpText
+                = "For more information, type 'help <item>' where <item> is one of the following:";
 
         /// <value>
         /// Commands organized by keyword in a tree
@@ -108,7 +112,9 @@ namespace OpenSim.Framework.Console
             // General help
             if (helpParts.Count == 0)
             {
+                help.Add(""); // Will become a newline.
                 help.Add(GeneralHelpText);
+                help.Add(ItemHelpText);
                 help.AddRange(CollectModulesHelp(tree));
             }
             else
@@ -132,7 +138,7 @@ namespace OpenSim.Framework.Console
             // Check modules first to see if we just need to display a list of those commands
             if (TryCollectModuleHelp(originalHelpRequest, help))
             {
-                help.Insert(0, GeneralHelpText);
+                help.Insert(0, ItemHelpText);
                 return help;
             }
             
diff --git a/OpenSim/Framework/Console/ConsoleTable.cs b/OpenSim/Framework/Console/ConsoleTable.cs
new file mode 100644
index 0000000..be3025b
--- /dev/null
+++ b/OpenSim/Framework/Console/ConsoleTable.cs
@@ -0,0 +1,139 @@
+/*
+ * 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.Linq;
+using System.Text;
+
+namespace OpenSim.Framework.Console
+{
+    /// <summary>
+    /// Used to generated a formatted table for the console.
+    /// </summary>
+    /// <remarks>
+    /// Currently subject to change.  If you use this, be prepared to change your code when this class changes.
+    /// </remarks>
+    public class ConsoleTable
+    {
+        /// <summary>
+        /// Default number of spaces between table columns.
+        /// </summary>
+        public const int DefaultTableSpacing = 2;
+
+        /// <summary>
+        /// Table columns.
+        /// </summary>
+        public List<ConsoleTableColumn> Columns { get; private set; }
+
+        /// <summary>
+        /// Table rows
+        /// </summary>
+        public List<ConsoleTableRow> Rows { get; private set; }
+
+        /// <summary>
+        /// Number of spaces to indent the table.
+        /// </summary>
+        public int Indent { get; set; }
+
+        /// <summary>
+        /// Spacing between table columns
+        /// </summary>
+        public int TableSpacing { get; set; }
+
+        public ConsoleTable()
+        {
+            TableSpacing = DefaultTableSpacing;
+            Columns = new List<ConsoleTableColumn>();
+            Rows = new List<ConsoleTableRow>();
+        }
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            AddToStringBuilder(sb);
+            return sb.ToString();
+        }
+
+        public void AddToStringBuilder(StringBuilder sb)
+        {
+            string formatString = GetFormatString();
+//            System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
+
+            // columns
+            sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
+
+            // rows
+            foreach (ConsoleTableRow row in Rows)
+                sb.AppendFormat(formatString, row.Cells.ToArray());
+        }
+
+        /// <summary>
+        /// Gets the format string for the table.
+        /// </summary>
+        private string GetFormatString()
+        {
+            StringBuilder formatSb = new StringBuilder();
+
+            formatSb.Append(' ', Indent);
+
+            for (int i = 0; i < Columns.Count; i++)
+            {
+                formatSb.Append(' ', TableSpacing);
+
+                // Can only do left formatting for now
+                formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
+            }
+
+            formatSb.Append('\n');
+
+            return formatSb.ToString();
+        }
+    }
+
+    public struct ConsoleTableColumn
+    {
+        public string Header { get; set; }
+        public int Width { get; set; }
+
+        public ConsoleTableColumn(string header, int width) : this()
+        {
+            Header = header;
+            Width = width;
+        }
+    }
+
+    public struct ConsoleTableRow
+    {
+        public List<string> Cells { get; private set; }
+
+        public ConsoleTableRow(List<string> cells) : this()
+        {
+            Cells = cells;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 7c8626d..f65813b 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -296,6 +296,10 @@ namespace OpenSim.Framework.Console
                             matches[0].Groups["Category"].Value);
                     System.Console.Write("]:");
                 }
+                else
+                {
+                    outText = outText.Trim();
+                }
             }
 
             if (level == "error")
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 142b783..9020761 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -346,7 +346,7 @@ namespace OpenSim.Framework
                 l_EstateManagers.Remove(avatarID);
         }
 
-        public bool IsEstateManager(UUID avatarID)
+        public bool IsEstateManagerOrOwner(UUID avatarID)
         {
             if (IsEstateOwner(avatarID))
                 return true;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
                 if (ban.BannedUserID == avatarID)
                     return true;
 
-            if (!IsEstateManager(avatarID) && !HasAccess(avatarID))
+            if (!IsEstateManagerOrOwner(avatarID) && !HasAccess(avatarID))
             {
                 if (DenyMinors)
                 {
@@ -411,7 +411,7 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
-            if (IsEstateManager(user))
+            if (IsEstateManagerOrOwner(user))
                 return true;
 
             return l_EstateAccess.Contains(user);
diff --git a/OpenSim/Framework/OSChatMessage.cs b/OpenSim/Framework/OSChatMessage.cs
index 54fa275..455756d 100644
--- a/OpenSim/Framework/OSChatMessage.cs
+++ b/OpenSim/Framework/OSChatMessage.cs
@@ -51,10 +51,12 @@ namespace OpenSim.Framework
         protected object m_senderObject;
         protected ChatTypeEnum m_type;
         protected UUID m_fromID;
+        protected UUID m_toID;
 
         public OSChatMessage()
         {
             m_position = new Vector3();
+            m_toID = UUID.Zero;
         }
 
         /// <summary>
@@ -102,6 +104,15 @@ namespace OpenSim.Framework
             set { m_from = value; }
         }
 
+        /// <summary>
+        /// The name of the sender (needed for scripts)
+        /// </summary>
+        public string To
+        {
+            get { return m_from; }
+            set { m_from = value; }
+        }
+
         #region IEventArgs Members
 
         /// TODO: Sender and SenderObject should just be Sender and of
@@ -132,6 +143,15 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
+        /// The single recipient or all if not set.
+        /// </summary>
+        public UUID TargetUUID
+        {
+            get { return m_toID; }
+            set { m_toID = value; }
+        }
+
+        /// <summary>
         ///
         /// </summary>
         public IScene Scene
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c6ccc9e..fcc9873 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -241,10 +241,14 @@ namespace OpenSim.Framework
 
             m_textureEntry = prim.Textures.GetBytes();
 
-            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
-            SculptData = prim.Sculpt.GetBytes();
-            SculptTexture = prim.Sculpt.SculptTexture;
-            SculptType = (byte)prim.Sculpt.Type;
+            if (prim.Sculpt != null)
+            {
+                SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+                SculptData = prim.Sculpt.GetBytes();
+                SculptTexture = prim.Sculpt.SculptTexture;
+                SculptType = (byte)prim.Sculpt.Type;
+            }
+            else SculptType = (byte)OpenMetaverse.SculptType.None;
         }
 
         [XmlIgnore]
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index c142bd9..47a2780 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
+using System.Runtime.Serialization;
 
 namespace OpenSim.Framework
 {
@@ -71,6 +72,32 @@ namespace OpenSim.Framework
 
             return pos + offset;
         }
+
+        /// <summary>
+        /// Returns a string representation of this SpawnPoint.
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return string.Format("{0},{1},{2}", Yaw, Pitch, Distance);
+        }
+
+        /// <summary>
+        /// Generate a SpawnPoint from a string
+        /// </summary>
+        /// <param name="str"></param>
+        public static SpawnPoint Parse(string str)
+        {
+            string[] parts = str.Split(',');
+            if (parts.Length != 3)
+                throw new ArgumentException("Invalid string: " + str);
+            
+            SpawnPoint sp = new SpawnPoint();
+            sp.Yaw = float.Parse(parts[0]);
+            sp.Pitch = float.Parse(parts[1]);
+            sp.Distance = float.Parse(parts[2]);
+            return sp;
+        }
     }
 
     public class RegionSettings
@@ -478,7 +505,7 @@ namespace OpenSim.Framework
         }
 
         // Connected Telehub object
-        private UUID m_TelehubObject;
+        private UUID m_TelehubObject = UUID.Zero;
         public UUID TelehubObject
         {
             get
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index db4541e..537de7a 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -38,239 +38,189 @@ namespace OpenSim.Framework
     public static class SLUtil
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         #region SL / file extension / content-type conversions
 
-        public static string SLAssetTypeToContentType(int assetType)
+        private class TypeMapping
         {
-            switch ((AssetType)assetType)
+            private sbyte assetType;
+            private InventoryType inventoryType;
+            private string contentType;
+            private string contentType2;
+            private string extension;
+
+            public sbyte AssetTypeCode
+            {
+                get { return assetType; }
+            }
+
+            public object AssetType
+            {
+                get {
+                    if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
+                        return (OpenMetaverse.AssetType)assetType;
+                    else
+                        return OpenMetaverse.AssetType.Unknown;
+                }
+            }
+
+            public InventoryType InventoryType
+            {
+                get { return inventoryType; }
+            }
+
+            public string ContentType
+            {
+                get { return contentType; }
+            }
+
+            public string ContentType2
+            {
+                get { return contentType2; }
+            }
+
+            public string Extension
+            {
+                get { return extension; }
+            }
+
+            private TypeMapping(sbyte assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
+            {
+                this.assetType = assetType;
+                this.inventoryType = inventoryType;
+                this.contentType = contentType;
+                this.contentType2 = contentType2;
+                this.extension = extension;
+            }
+
+            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
+                : this((sbyte)assetType, inventoryType, contentType, contentType2, extension)
+            {
+            }
+
+            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string extension)
+                : this((sbyte)assetType, inventoryType, contentType, null, extension)
             {
-                case AssetType.Texture:
-                    return "image/x-j2c";
-                case AssetType.Sound:
-                    return "audio/ogg";
-                case AssetType.CallingCard:
-                    return "application/vnd.ll.callingcard";
-                case AssetType.Landmark:
-                    return "application/vnd.ll.landmark";
-                case AssetType.Clothing:
-                    return "application/vnd.ll.clothing";
-                case AssetType.Object:
-                    return "application/vnd.ll.primitive";
-                case AssetType.Notecard:
-                    return "application/vnd.ll.notecard";
-                case AssetType.Folder:
-                    return "application/vnd.ll.folder";
-                case AssetType.RootFolder:
-                    return "application/vnd.ll.rootfolder";
-                case AssetType.LSLText:
-                    return "application/vnd.ll.lsltext";
-                case AssetType.LSLBytecode:
-                    return "application/vnd.ll.lslbyte";
-                case AssetType.TextureTGA:
-                case AssetType.ImageTGA:
-                    return "image/tga";
-                case AssetType.Bodypart:
-                    return "application/vnd.ll.bodypart";
-                case AssetType.TrashFolder:
-                    return "application/vnd.ll.trashfolder";
-                case AssetType.SnapshotFolder:
-                    return "application/vnd.ll.snapshotfolder";
-                case AssetType.LostAndFoundFolder:
-                    return "application/vnd.ll.lostandfoundfolder";
-                case AssetType.SoundWAV:
-                    return "audio/x-wav";
-                case AssetType.ImageJPEG:
-                    return "image/jpeg";
-                case AssetType.Animation:
-                    return "application/vnd.ll.animation";
-                case AssetType.Gesture:
-                    return "application/vnd.ll.gesture";
-                case AssetType.Simstate:
-                    return "application/x-metaverse-simstate";
-                case AssetType.FavoriteFolder:
-                    return "application/vnd.ll.favoritefolder";
-                case AssetType.Link:
-                    return "application/vnd.ll.link";
-                case AssetType.LinkFolder:
-                    return "application/vnd.ll.linkfolder";
-                case AssetType.CurrentOutfitFolder:
-                    return "application/vnd.ll.currentoutfitfolder";
-                case AssetType.OutfitFolder:
-                    return "application/vnd.ll.outfitfolder";
-                case AssetType.MyOutfitsFolder:
-                    return "application/vnd.ll.myoutfitsfolder";
-                case AssetType.Unknown:
-                default:
-                    return "application/octet-stream";
             }
         }
 
-        public static string SLInvTypeToContentType(int invType)
+        /// <summary>
+        /// Maps between AssetType, InventoryType and Content-Type.
+        /// Where more than one possibility exists, the first one takes precedence. E.g.:
+        ///   AssetType "AssetType.Texture" -> Content-Type "image-xj2c"
+        ///   Content-Type "image/x-j2c" -> InventoryType "InventoryType.Texture"
+        /// </summary>
+        private static TypeMapping[] MAPPINGS = new TypeMapping[] {
+            new TypeMapping(AssetType.Unknown, InventoryType.Unknown, "application/octet-stream", "bin"),
+            new TypeMapping(AssetType.Texture, InventoryType.Texture, "image/x-j2c", "image/jp2", "j2c"),
+            new TypeMapping(AssetType.Texture, InventoryType.Snapshot, "image/x-j2c", "image/jp2", "j2c"),
+            new TypeMapping(AssetType.TextureTGA, InventoryType.Texture, "image/tga", "tga"),
+            new TypeMapping(AssetType.ImageTGA, InventoryType.Texture, "image/tga", "tga"),
+            new TypeMapping(AssetType.ImageJPEG, InventoryType.Texture, "image/jpeg", "jpg"),
+            new TypeMapping(AssetType.Sound, InventoryType.Sound, "audio/ogg", "application/ogg", "ogg"),
+            new TypeMapping(AssetType.SoundWAV, InventoryType.Sound, "audio/x-wav", "wav"),
+            new TypeMapping(AssetType.CallingCard, InventoryType.CallingCard, "application/vnd.ll.callingcard", "application/x-metaverse-callingcard", "callingcard"),
+            new TypeMapping(AssetType.Landmark, InventoryType.Landmark, "application/vnd.ll.landmark", "application/x-metaverse-landmark", "landmark"),
+            new TypeMapping(AssetType.Clothing, InventoryType.Wearable, "application/vnd.ll.clothing", "application/x-metaverse-clothing", "clothing"),
+            new TypeMapping(AssetType.Object, InventoryType.Object, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
+            new TypeMapping(AssetType.Object, InventoryType.Attachment, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
+            new TypeMapping(AssetType.Notecard, InventoryType.Notecard, "application/vnd.ll.notecard", "application/x-metaverse-notecard", "notecard"),
+            new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
+            new TypeMapping(AssetType.RootFolder, InventoryType.RootCategory, "application/vnd.ll.rootfolder", "rootfolder"),
+            new TypeMapping(AssetType.LSLText, InventoryType.LSL, "application/vnd.ll.lsltext", "application/x-metaverse-lsl", "lsl"),
+            new TypeMapping(AssetType.LSLBytecode, InventoryType.LSL, "application/vnd.ll.lslbyte", "application/x-metaverse-lso", "lso"),
+            new TypeMapping(AssetType.Bodypart, InventoryType.Wearable, "application/vnd.ll.bodypart", "application/x-metaverse-bodypart", "bodypart"),
+            new TypeMapping(AssetType.TrashFolder, InventoryType.Folder, "application/vnd.ll.trashfolder", "trashfolder"),
+            new TypeMapping(AssetType.SnapshotFolder, InventoryType.Folder, "application/vnd.ll.snapshotfolder", "snapshotfolder"),
+            new TypeMapping(AssetType.LostAndFoundFolder, InventoryType.Folder, "application/vnd.ll.lostandfoundfolder", "lostandfoundfolder"),
+            new TypeMapping(AssetType.Animation, InventoryType.Animation, "application/vnd.ll.animation", "application/x-metaverse-animation", "animation"),
+            new TypeMapping(AssetType.Gesture, InventoryType.Gesture, "application/vnd.ll.gesture", "application/x-metaverse-gesture", "gesture"),
+            new TypeMapping(AssetType.Simstate, InventoryType.Snapshot, "application/x-metaverse-simstate", "simstate"),
+            new TypeMapping(AssetType.FavoriteFolder, InventoryType.Unknown, "application/vnd.ll.favoritefolder", "favoritefolder"),
+            new TypeMapping(AssetType.Link, InventoryType.Unknown, "application/vnd.ll.link", "link"),
+            new TypeMapping(AssetType.LinkFolder, InventoryType.Unknown, "application/vnd.ll.linkfolder", "linkfolder"),
+            new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
+            new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
+            new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
+            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
+        };
+
+        private static Dictionary<sbyte, string> asset2Content;
+        private static Dictionary<sbyte, string> asset2Extension;
+        private static Dictionary<InventoryType, string> inventory2Content;
+        private static Dictionary<string, sbyte> content2Asset;
+        private static Dictionary<string, InventoryType> content2Inventory;
+
+        static SLUtil()
         {
-            switch ((InventoryType)invType)
+            asset2Content = new Dictionary<sbyte, string>();
+            asset2Extension = new Dictionary<sbyte, string>();
+            inventory2Content = new Dictionary<InventoryType, string>();
+            content2Asset = new Dictionary<string, sbyte>();
+            content2Inventory = new Dictionary<string, InventoryType>();
+            
+            foreach (TypeMapping mapping in MAPPINGS)
             {
-                case InventoryType.Animation:
-                    return "application/vnd.ll.animation";
-                case InventoryType.CallingCard:
-                    return "application/vnd.ll.callingcard";
-                case InventoryType.Folder:
-                    return "application/vnd.ll.folder";
-                case InventoryType.Gesture:
-                    return "application/vnd.ll.gesture";
-                case InventoryType.Landmark:
-                    return "application/vnd.ll.landmark";
-                case InventoryType.LSL:
-                    return "application/vnd.ll.lsltext";
-                case InventoryType.Notecard:
-                    return "application/vnd.ll.notecard";
-                case InventoryType.Attachment:
-                case InventoryType.Object:
-                    return "application/vnd.ll.primitive";
-                case InventoryType.Sound:
-                    return "audio/ogg";
-                case InventoryType.Snapshot:
-                case InventoryType.Texture:
-                    return "image/x-j2c";
-                case InventoryType.Wearable:
-                    return "application/vnd.ll.clothing";
-                default:
-                    return "application/octet-stream";
+                sbyte assetType = mapping.AssetTypeCode;
+                if (!asset2Content.ContainsKey(assetType))
+                    asset2Content.Add(assetType, mapping.ContentType);
+                if (!asset2Extension.ContainsKey(assetType))
+                    asset2Extension.Add(assetType, mapping.Extension);
+                if (!inventory2Content.ContainsKey(mapping.InventoryType))
+                    inventory2Content.Add(mapping.InventoryType, mapping.ContentType);
+                if (!content2Asset.ContainsKey(mapping.ContentType))
+                    content2Asset.Add(mapping.ContentType, assetType);
+                if (!content2Inventory.ContainsKey(mapping.ContentType))
+                    content2Inventory.Add(mapping.ContentType, mapping.InventoryType);
+
+                if (mapping.ContentType2 != null)
+                {
+                    if (!content2Asset.ContainsKey(mapping.ContentType2))
+                        content2Asset.Add(mapping.ContentType2, assetType);
+                    if (!content2Inventory.ContainsKey(mapping.ContentType2))
+                        content2Inventory.Add(mapping.ContentType2, mapping.InventoryType);
+                }
             }
         }
+        
+        public static string SLAssetTypeToContentType(int assetType)
+        {
+            string contentType;
+            if (!asset2Content.TryGetValue((sbyte)assetType, out contentType))
+                contentType = asset2Content[(sbyte)AssetType.Unknown];
+            return contentType;
+        }
+
+        public static string SLInvTypeToContentType(int invType)
+        {
+            string contentType;
+            if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
+                contentType = inventory2Content[InventoryType.Unknown];
+            return contentType;
+        }
 
         public static sbyte ContentTypeToSLAssetType(string contentType)
         {
-            switch (contentType)
-            {
-                case "image/x-j2c":
-                case "image/jp2":
-                    return (sbyte)AssetType.Texture;
-                case "application/ogg":
-                case "audio/ogg":
-                    return (sbyte)AssetType.Sound;
-                case "application/vnd.ll.callingcard":
-                case "application/x-metaverse-callingcard":
-                    return (sbyte)AssetType.CallingCard;
-                case "application/vnd.ll.landmark":
-                case "application/x-metaverse-landmark":
-                    return (sbyte)AssetType.Landmark;
-                case "application/vnd.ll.clothing":
-                case "application/x-metaverse-clothing":
-                    return (sbyte)AssetType.Clothing;
-                case "application/vnd.ll.primitive":
-                case "application/x-metaverse-primitive":
-                    return (sbyte)AssetType.Object;
-                case "application/vnd.ll.notecard":
-                case "application/x-metaverse-notecard":
-                    return (sbyte)AssetType.Notecard;
-                case "application/vnd.ll.folder":
-                    return (sbyte)AssetType.Folder;
-                case "application/vnd.ll.rootfolder":
-                    return (sbyte)AssetType.RootFolder;
-                case "application/vnd.ll.lsltext":
-                case "application/x-metaverse-lsl":
-                    return (sbyte)AssetType.LSLText;
-                case "application/vnd.ll.lslbyte":
-                case "application/x-metaverse-lso":
-                    return (sbyte)AssetType.LSLBytecode;
-                case "image/tga":
-                    // Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
-                    return (sbyte)AssetType.ImageTGA;
-                case "application/vnd.ll.bodypart":
-                case "application/x-metaverse-bodypart":
-                    return (sbyte)AssetType.Bodypart;
-                case "application/vnd.ll.trashfolder":
-                    return (sbyte)AssetType.TrashFolder;
-                case "application/vnd.ll.snapshotfolder":
-                    return (sbyte)AssetType.SnapshotFolder;
-                case "application/vnd.ll.lostandfoundfolder":
-                    return (sbyte)AssetType.LostAndFoundFolder;
-                case "audio/x-wav":
-                    return (sbyte)AssetType.SoundWAV;
-                case "image/jpeg":
-                    return (sbyte)AssetType.ImageJPEG;
-                case "application/vnd.ll.animation":
-                case "application/x-metaverse-animation":
-                    return (sbyte)AssetType.Animation;
-                case "application/vnd.ll.gesture":
-                case "application/x-metaverse-gesture":
-                    return (sbyte)AssetType.Gesture;
-                case "application/x-metaverse-simstate":
-                    return (sbyte)AssetType.Simstate;
-                case "application/vnd.ll.favoritefolder":
-                    return (sbyte)AssetType.FavoriteFolder;
-                case "application/vnd.ll.link":
-                    return (sbyte)AssetType.Link;
-                case "application/vnd.ll.linkfolder":
-                    return (sbyte)AssetType.LinkFolder;
-                case "application/vnd.ll.currentoutfitfolder":
-                    return (sbyte)AssetType.CurrentOutfitFolder;
-                case "application/vnd.ll.outfitfolder":
-                    return (sbyte)AssetType.OutfitFolder;
-                case "application/vnd.ll.myoutfitsfolder":
-                    return (sbyte)AssetType.MyOutfitsFolder;
-                case "application/octet-stream":
-                default:
-                    return (sbyte)AssetType.Unknown;
-            }
+            sbyte assetType;
+            if (!content2Asset.TryGetValue(contentType, out assetType))
+                assetType = (sbyte)AssetType.Unknown;
+            return (sbyte)assetType;
         }
 
         public static sbyte ContentTypeToSLInvType(string contentType)
         {
-            switch (contentType)
-            {
-                case "image/x-j2c":
-                case "image/jp2":
-                case "image/tga":
-                case "image/jpeg":
-                    return (sbyte)InventoryType.Texture;
-                case "application/ogg":
-                case "audio/ogg":
-                case "audio/x-wav":
-                    return (sbyte)InventoryType.Sound;
-                case "application/vnd.ll.callingcard":
-                case "application/x-metaverse-callingcard":
-                    return (sbyte)InventoryType.CallingCard;
-                case "application/vnd.ll.landmark":
-                case "application/x-metaverse-landmark":
-                    return (sbyte)InventoryType.Landmark;
-                case "application/vnd.ll.clothing":
-                case "application/x-metaverse-clothing":
-                case "application/vnd.ll.bodypart":
-                case "application/x-metaverse-bodypart":
-                    return (sbyte)InventoryType.Wearable;
-                case "application/vnd.ll.primitive":
-                case "application/x-metaverse-primitive":
-                    return (sbyte)InventoryType.Object;
-                case "application/vnd.ll.notecard":
-                case "application/x-metaverse-notecard":
-                    return (sbyte)InventoryType.Notecard;
-                case "application/vnd.ll.folder":
-                    return (sbyte)InventoryType.Folder;
-                case "application/vnd.ll.rootfolder":
-                    return (sbyte)InventoryType.RootCategory;
-                case "application/vnd.ll.lsltext":
-                case "application/x-metaverse-lsl":
-                case "application/vnd.ll.lslbyte":
-                case "application/x-metaverse-lso":
-                    return (sbyte)InventoryType.LSL;
-                case "application/vnd.ll.trashfolder":
-                case "application/vnd.ll.snapshotfolder":
-                case "application/vnd.ll.lostandfoundfolder":
-                    return (sbyte)InventoryType.Folder;
-                case "application/vnd.ll.animation":
-                case "application/x-metaverse-animation":
-                    return (sbyte)InventoryType.Animation;
-                case "application/vnd.ll.gesture":
-                case "application/x-metaverse-gesture":
-                    return (sbyte)InventoryType.Gesture;
-                case "application/x-metaverse-simstate":
-                    return (sbyte)InventoryType.Snapshot;
-                case "application/octet-stream":
-                default:
-                    return (sbyte)InventoryType.Unknown;
-            }
+            InventoryType invType;
+            if (!content2Inventory.TryGetValue(contentType, out invType))
+                invType = InventoryType.Unknown;
+            return (sbyte)invType;
+        }
+
+        public static string SLAssetTypeToExtension(int assetType)
+        {
+            string extension;
+            if (!asset2Extension.TryGetValue((sbyte)assetType, out extension))
+                extension = asset2Extension[(sbyte)AssetType.Unknown];
+            return extension;
         }
 
         #endregion SL / file extension / content-type conversions
@@ -377,4 +327,4 @@ namespace OpenSim.Framework
             return output;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 931898c..f18435d 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -30,6 +30,8 @@ using System.Text;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
+using log4net;
+using System.Reflection;
 
 namespace OpenSim.Framework.Serialization.External
 {
@@ -187,7 +189,29 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-            
+
+            xtr.ReadEndElement();
+
+            if (xtr.IsStartElement("Telehub"))
+            {
+                xtr.ReadStartElement("Telehub");
+
+                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
+                {
+                    switch (xtr.Name)
+                    {
+                        case "TelehubObject":
+                            settings.TelehubObject = UUID.Parse(xtr.ReadElementContentAsString());
+                            break;
+                        case "SpawnPoint":
+                            string str = xtr.ReadElementContentAsString();
+                            SpawnPoint sp = SpawnPoint.Parse(str);
+                            settings.AddSpawnPoint(sp);
+                            break;
+                    }
+                }
+            }
+
             xtr.Close();
             sr.Close();
             
@@ -243,7 +267,16 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("SunPosition", settings.SunPosition.ToString());
             // Note: 'SunVector' isn't saved because this value is owned by the Sun Module, which
             // calculates it automatically according to the date and other factors.
-            xtw.WriteEndElement(); 
+            xtw.WriteEndElement();
+
+            xtw.WriteStartElement("Telehub");
+            if (settings.TelehubObject != UUID.Zero)
+            {
+                xtw.WriteElementString("TelehubObject", settings.TelehubObject.ToString());
+                foreach (SpawnPoint sp in settings.SpawnPoints())
+                    xtw.WriteElementString("SpawnPoint", sp.ToString());
+            }
+            xtw.WriteEndElement();
             
             xtw.WriteEndElement();
             
diff --git a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
index a61e4af..09b6f6d 100644
--- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
@@ -78,6 +78,10 @@ namespace OpenSim.Framework.Serialization.Tests
     <FixedSun>true</FixedSun>
     <SunPosition>12</SunPosition>
   </Terrain>
+  <Telehub>
+    <TelehubObject>00000000-0000-0000-0000-111111111111</TelehubObject>
+    <SpawnPoint>1,-2,0.33</SpawnPoint>
+  </Telehub>
 </RegionSettings>";
 
         private RegionSettings m_rs;
@@ -116,6 +120,8 @@ namespace OpenSim.Framework.Serialization.Tests
             m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080");
             m_rs.UseEstateSun = true;
             m_rs.WaterHeight = 23;
+            m_rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
+            m_rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
         }
 
         [Test]
@@ -129,6 +135,8 @@ namespace OpenSim.Framework.Serialization.Tests
             Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
             Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));
             Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit));
+            Assert.That(deserRs.TelehubObject, Is.EqualTo(m_rs.TelehubObject));
+            Assert.That(deserRs.SpawnPoints()[0].ToString(), Is.EqualTo(m_rs.SpawnPoints()[0].ToString()));
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
index 2fe9769..9f8f4a8 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs
@@ -33,9 +33,9 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         public abstract Hashtable Handle(string path, Hashtable Request);
 
-        protected BaseHTTPHandler(string httpMethod, string path)
-            : base(httpMethod, path)
-        {
-        }
+        protected BaseHTTPHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseHTTPHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ad5af1f..f5addc8 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        public List<string>  GetStreamHandlerKeys()
+        public List<string> GetStreamHandlerKeys()
         {
             lock (m_streamHandlers)
                 return new List<string>(m_streamHandlers.Keys);
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
             }
         }
 
@@ -410,6 +410,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 //            string reqnum = "unknown";
             int tickstart = Environment.TickCount;
 
+            IRequestHandler requestHandler = null;
+
             try
             {
                 // OpenSim.Framework.WebUtil.OSHeaderRequestID
@@ -438,8 +440,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //response.KeepAlive = true;
                 response.SendChunked = false;
 
-                IRequestHandler requestHandler;
-
                 string path = request.RawUrl;
                 string handlerKey = GetHandlerKey(request.HttpMethod, path);
 
@@ -447,8 +447,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     if (DebugLevel >= 1)
                         m_log.DebugFormat(
-                            "[BASE HTTP SERVER]: Found stream handler for {0} {1}",
-                            request.HttpMethod, request.Url.PathAndQuery);
+                            "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
+                            request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
 
                     // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
                     byte[] buffer = null;
@@ -551,11 +551,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException e)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                     }
                     catch (IOException e)
                     {
-                        m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
                     }
 
                     return;
@@ -658,15 +658,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //
                 // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
                 // with the minimum first
-                m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
+                m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
             }
             catch (IOException e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
                 SendHTML500(response);
             }
             finally
@@ -675,8 +675,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // since its just for reporting, tickdiff limit can be adjusted
                 int tickdiff = Environment.TickCount - tickstart;
                 if (tickdiff > 3000)
+                {
                     m_log.InfoFormat(
-                        "[BASE HTTP SERVER]: slow {0} request for {1} from {2} took {3} ms", requestMethod, uriString, request.RemoteIPEndPoint.ToString(), tickdiff);
+                        "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms",
+                        requestMethod,
+                        uriString,
+                        requestHandler != null ? requestHandler.Name : "",
+                        requestHandler != null ? requestHandler.Description : "",
+                        request.RemoteIPEndPoint.ToString(),
+                        tickdiff);
+                }
             }
         }
 
@@ -925,11 +933,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                         catch (SocketException e)
                         {
                             // This has to be here to prevent a Linux/Mono crash
-                            m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                         }
                         catch (IOException e)
                         {
-                            m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                         }
                     }
                     return;
@@ -962,11 +970,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1077,12 +1085,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (IOException e)
                 {
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
                 }
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1334,8 +1342,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException f)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat(
-                            "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
+                        m_log.Warn(
+                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
                     }
                 }
                 catch(Exception)
@@ -1653,11 +1661,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1694,7 +1702,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1730,7 +1738,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1809,7 +1817,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void httpServerException(object source, Exception exception)
         {
-            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
+            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
            /*
             if (HTTPDRunning)// && NotSocketErrors > 5)
             {
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index a2135a3..ae7aaf2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -45,8 +45,16 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly string m_path;
 
-        protected BaseRequestHandler(string httpMethod, string path)
+        public string Name { get; private set; }
+
+        public string Description { get; private set; }
+
+        protected BaseRequestHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseRequestHandler(string httpMethod, string path, string name, string description)
         {
+            Name = name;
+            Description = description;
             m_httpMethod = httpMethod;
             m_path = path;
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index f1cde74..6342983 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -34,8 +34,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         public abstract byte[] Handle(string path, Stream request,
                                       IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
 
-        protected BaseStreamHandler(string httpMethod, string path) : base(httpMethod, path)
-        {
-        }
+        protected BaseStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseStreamHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
index 1699233..b94bfb4 100644
--- a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
@@ -36,6 +36,15 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private BinaryMethod m_method;
 
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
+            : this(httpMethod, path, binaryMethod, null, null) {}
+
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_method = binaryMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] data = ReadFully(request);
@@ -45,12 +54,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             return Encoding.UTF8.GetBytes(responseString);
         }
 
-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
-            : base(httpMethod, path)
-        {
-            m_method = binaryMethod;
-        }
-
         private static byte[] ReadFully(Stream stream)
         {
             byte[] buffer = new byte[1024];
@@ -70,4 +73,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index a449c2d..cb5cce5 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -32,6 +32,25 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public interface IRequestHandler
     {
+
+        /// <summary>
+        /// Name for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Name { get; }
+
+        /// <summary>
+        /// Description for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Description { get; }
+
         // Return response content type
         string ContentType { get; }
 
@@ -58,4 +77,4 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         Hashtable Handle(string path, Hashtable request);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index a467a83..07082a8 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
 
         public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public RestDeserialiseHandler(
+            string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
index 1f23cac..7f89839 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs
@@ -38,19 +38,25 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_dhttpMethod; }
         }
 
-        public override Hashtable Handle(string path, Hashtable request)
+        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
+            : base(httpMethod, path)
         {
+            m_dhttpMethod = dhttpMethod;
+        }
+
+        public RestHTTPHandler(
+            string httpMethod, string path, GenericHTTPMethod dhttpMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_dhttpMethod = dhttpMethod;
+        }
 
+        public override Hashtable Handle(string path, Hashtable request)
+        {
             string param = GetParam(path);
             request.Add("param", param);
             request.Add("path", path);
             return m_dhttpMethod(request);
         }
-
-        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
-            : base(httpMethod, path)
-        {
-            m_dhttpMethod = dhttpMethod;
-        }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
index d2c4002..1f17fee 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
@@ -39,6 +39,15 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_restMethod; }
         }
 
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod)
+            : this(httpMethod, path, restMethod, null, null) {}
+
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_restMethod = restMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Encoding encoding = Encoding.UTF8;
@@ -52,10 +61,5 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return Encoding.UTF8.GetBytes(responseString);
         }
-
-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base(httpMethod, path)
-        {
-            m_restMethod = restMethod;
-        }
     }
 }
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 7ef8bf7..fb818ee 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -35,6 +37,8 @@ namespace OpenSim.Framework
     /// </summary>
     public class TaskInventoryItem : ICloneable
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// XXX This should really be factored out into some constants class.
         /// </summary>
@@ -334,12 +338,18 @@ namespace OpenSim.Framework
             }
         }
 
-        public bool OwnerChanged {
-            get {
+        public bool OwnerChanged
+        {
+            get
+            {
                 return _ownerChanged;
             }
-            set {
+            set
+            {
                 _ownerChanged = value;
+//                m_log.DebugFormat(
+//                    "[TASK INVENTORY ITEM]: Owner changed set {0} for {1} {2} owned by {3}",
+//                    _ownerChanged, Name, ItemID, OwnerID);
             }
         }
 
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 34a3f15..6fde488 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -227,10 +227,10 @@ namespace OpenSim.Framework.Tests
             es.AddEstateManager(UUID.Zero);
 
             es.AddEstateManager(bannedUserId);
-            Assert.IsTrue(es.IsEstateManager(bannedUserId), "bannedUserId should be EstateManager but isn't.");
+            Assert.IsTrue(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserId should be EstateManager but isn't.");
 
             es.RemoveEstateManager(bannedUserId);
-            Assert.IsFalse(es.IsEstateManager(bannedUserId), "bannedUserID is estateManager but shouldn't be");
+            Assert.IsFalse(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserID is estateManager but shouldn't be");
 
             Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't");
 
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 1ca35df..f0d2a3f 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -214,16 +214,13 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < contenttypes.Length; i++)
             {
-                if (SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == 18)
-                {
-                    Assert.That(contenttypes[i] == "image/tga");
-                }
+                int expected;
+                if (contenttypes[i] == "image/tga")
+                    expected = 12;  // if we know only the content-type "image/tga", then we assume the asset type is TextureTGA; not ImageTGA
                 else
-                {
-                    Assert.That(SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == assettypes[i],
-                                "Expecting {0} but got {1}", assettypes[i],
-                                SLUtil.ContentTypeToSLAssetType(contenttypes[i]));
-                }
+                    expected = assettypes[i];
+                Assert.AreEqual(expected, SLUtil.ContentTypeToSLAssetType(contenttypes[i]),
+                            String.Format("Incorrect AssetType mapped from Content-Type {0}", contenttypes[i]));
             }
 
             int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};
@@ -237,7 +234,7 @@ namespace OpenSim.Framework.Tests
                                                "application/vnd.ll.primitive",
                                                "application/vnd.ll.notecard",
                                                "application/vnd.ll.folder",
-                                               "application/octet-stream",
+                                               "application/vnd.ll.rootfolder",
                                                "application/vnd.ll.lsltext",
                                                "image/x-j2c",
                                                "application/vnd.ll.primitive",
@@ -247,7 +244,8 @@ namespace OpenSim.Framework.Tests
         
             for (int i=0;i<inventorytypes.Length;i++)
             {
-                Assert.That(SLUtil.SLInvTypeToContentType(inventorytypes[i]) == invcontenttypes[i], "Expected {0}, Got {1}", invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]));
+                Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
+                    String.Format("Incorrect Content-Type mapped from InventoryType {0}", inventorytypes[i]));
             }
 
             invcontenttypes = new string[]
@@ -280,7 +278,8 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < invtypes.Length; i++)
             {
-                Assert.That(SLUtil.ContentTypeToSLInvType(invcontenttypes[i]) == invtypes[i], "Expected {0}, Got {1}", invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]));
+                Assert.AreEqual(invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]),
+                    String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
             }
         }
     }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index aac575c..6a40cd5 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -53,19 +53,36 @@ namespace OpenSim.Framework
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static int m_requestNumber = 0;
+        /// <summary>
+        /// Request number for diagnostic purposes.
+        /// </summary>
+        public static int RequestNumber = 0;
 
-        // this is the header field used to communicate the local request id
-        // used for performance and debugging
+        /// <summary>
+        /// this is the header field used to communicate the local request id
+        /// used for performance and debugging
+        /// </summary>
         public const string OSHeaderRequestID = "opensim-request-id";
 
-        // number of milliseconds a call can take before it is considered
-        // a "long" call for warning & debugging purposes
-        public const int LongCallTime = 500;
+        /// <summary>
+        /// Number of milliseconds a call can take before it is considered
+        /// a "long" call for warning & debugging purposes
+        /// </summary>
+        public const int LongCallTime = 3000;
 
-        // dictionary of end points
+        /// <summary>
+        /// The maximum length of any data logged because of a long request time.
+        /// </summary>
+        /// <remarks>
+        /// This is to truncate any really large post data, such as an asset.  In theory, the first section should
+        /// give us useful information about the call (which agent it relates to if applicable, etc.).
+        /// </remarks>
+        public const int MaxRequestDiagLength = 100;
+
+        /// <summary>
+        /// Dictionary of end points
+        /// </summary>
         private static Dictionary<string,object> m_endpointSerializer = new Dictionary<string,object>();
-        
 
         private static object EndPointLock(string url)
         {
@@ -86,8 +103,7 @@ namespace OpenSim.Framework
                 return eplock;
             }
         }
-        
-                
+
         #region JSONRequest
 
         /// <summary>
@@ -129,12 +145,13 @@ namespace OpenSim.Framework
 
         private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed)
         {
-            int reqnum = m_requestNumber++;
+            int reqnum = RequestNumber++;
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
 
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
+            string strBuffer = null;
 
             try
             {
@@ -149,7 +166,7 @@ namespace OpenSim.Framework
                 // If there is some input, write it into the request
                 if (data != null)
                 {
-                    string strBuffer =  OSDParser.SerializeJsonString(data);
+                    strBuffer =  OSDParser.SerializeJsonString(data);
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
                     if (compressed)
@@ -210,14 +227,23 @@ namespace OpenSim.Framework
             }
             finally
             {
-                // This just dumps a warning for any operation that takes more than 100 ms
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > LongCallTime)
-                    m_log.DebugFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing",
-                                     reqnum,url,method,tickdiff,tickdata);
+                    m_log.InfoFormat(
+                        "[OSD REQUEST]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                        reqnum,
+                        method,
+                        url,
+                        tickdiff,
+                        tickdata,
+                        strBuffer != null
+                            ? (strBuffer.Length > MaxRequestDiagLength ? strBuffer.Remove(MaxRequestDiagLength) : strBuffer)
+                            : "");
             }
            
-                m_log.DebugFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); 
+            m_log.DebugFormat(
+                "[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage);
+
             return ErrorResponseMap(errorMessage);
         }
 
@@ -290,17 +316,17 @@ namespace OpenSim.Framework
 
         private static OSDMap ServiceFormRequestWorker(string url, NameValueCollection data, int timeout)
         {
-            int reqnum = m_requestNumber++;
+            int reqnum = RequestNumber++;
             string method = (data != null && data["RequestMethod"] != null) ? data["RequestMethod"] : "unknown";
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
             
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
+            string queryString = null;
 
             try
             {
-                
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
                 request.Method = "POST";
                 request.Timeout = timeout;
@@ -311,7 +337,7 @@ namespace OpenSim.Framework
                 
                 if (data != null)
                 {
-                    string queryString = BuildQueryString(data);
+                    queryString = BuildQueryString(data);
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
                     
                     request.ContentLength = buffer.Length;
@@ -354,11 +380,20 @@ namespace OpenSim.Framework
             {
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > LongCallTime)
-                    m_log.InfoFormat("[WEB UTIL]: form request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing",
-                                     reqnum,url,method,tickdiff,tickdata);
+                    m_log.InfoFormat(
+                        "[SERVICE FORM]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                        reqnum,
+                        method,
+                        url,
+                        tickdiff,
+                        tickdata,
+                        queryString != null
+                            ? (queryString.Length > MaxRequestDiagLength) ? queryString.Remove(MaxRequestDiagLength) : queryString
+                            : "");
             }
 
-            m_log.WarnFormat("[WEB UTIL]: <{0}> form request failed: {1}",reqnum,errorMessage);
+            m_log.WarnFormat("[SERVICE FORM]: <{0}> form request to {1} failed: {2}", reqnum, url, errorMessage);
+
             return ErrorResponseMap(errorMessage);
         }
 
@@ -638,8 +673,6 @@ namespace OpenSim.Framework
 
             return new string[0];
         }
-
-
     }
 
     public static class AsynchronousRestObjectRequester
@@ -662,6 +695,12 @@ namespace OpenSim.Framework
         public static void MakeRequest<TRequest, TResponse>(string verb,
                 string requestUrl, TRequest obj, Action<TResponse> action)
         {
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
+
             //            m_log.DebugFormat("[ASYNC REQUEST]: Starting {0} {1}", verb, requestUrl);
 
             Type type = typeof(TRequest);
@@ -672,12 +711,13 @@ namespace OpenSim.Framework
             XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
 
             request.Method = verb;
+            MemoryStream buffer = null;
 
             if (verb == "POST")
             {
                 request.ContentType = "text/xml";
 
-                MemoryStream buffer = new MemoryStream();
+                buffer = new MemoryStream();
 
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
@@ -699,6 +739,9 @@ namespace OpenSim.Framework
                     requestStream.Write(buffer.ToArray(), 0, length);
                     requestStream.Close();
 
+                    // capture how much time was spent writing
+                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
+
                     request.BeginGetResponse(delegate(IAsyncResult ar)
                     {
                         response = request.EndGetResponse(ar);
@@ -724,83 +767,108 @@ namespace OpenSim.Framework
 
                     }, null);
                 }, null);
-
-
-                return;
             }
-
-            request.BeginGetResponse(delegate(IAsyncResult res2)
+            else
             {
-                try
+                request.BeginGetResponse(delegate(IAsyncResult res2)
                 {
-                    // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
-                    // documented in MSDN
-                    response = request.EndGetResponse(res2);
-
-                    Stream respStream = null;
                     try
                     {
-                        respStream = response.GetResponseStream();
-                        deserial = (TResponse)deserializer.Deserialize(respStream);
-                    }
-                    catch (System.InvalidOperationException)
-                    {
-                    }
-                    finally
-                    {
-                        respStream.Close();
-                        response.Close();
+                        // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
+                        // documented in MSDN
+                        response = request.EndGetResponse(res2);
+    
+                        Stream respStream = null;
+                        try
+                        {
+                            respStream = response.GetResponseStream();
+                            deserial = (TResponse)deserializer.Deserialize(respStream);
+                        }
+                        catch (System.InvalidOperationException)
+                        {
+                        }
+                        finally
+                        {
+                            respStream.Close();
+                            response.Close();
+                        }
                     }
-                }
-                catch (WebException e)
-                {
-                    if (e.Status == WebExceptionStatus.ProtocolError)
+                    catch (WebException e)
                     {
-                        if (e.Response is HttpWebResponse)
+                        if (e.Status == WebExceptionStatus.ProtocolError)
                         {
-                            HttpWebResponse httpResponse = (HttpWebResponse)e.Response;
-
-                            if (httpResponse.StatusCode != HttpStatusCode.NotFound)
+                            if (e.Response is HttpWebResponse)
                             {
-                                // We don't appear to be handling any other status codes, so log these feailures to that
-                                // people don't spend unnecessary hours hunting phantom bugs.
-                                m_log.DebugFormat(
-                                    "[ASYNC REQUEST]: Request {0} {1} failed with unexpected status code {2}",
-                                    verb, requestUrl, httpResponse.StatusCode);
+                                HttpWebResponse httpResponse = (HttpWebResponse)e.Response;
+    
+                                if (httpResponse.StatusCode != HttpStatusCode.NotFound)
+                                {
+                                    // We don't appear to be handling any other status codes, so log these feailures to that
+                                    // people don't spend unnecessary hours hunting phantom bugs.
+                                    m_log.DebugFormat(
+                                        "[ASYNC REQUEST]: Request {0} {1} failed with unexpected status code {2}",
+                                        verb, requestUrl, httpResponse.StatusCode);
+                                }
                             }
                         }
+                        else
+                        {
+                            m_log.ErrorFormat(
+                                "[ASYNC REQUEST]: Request {0} {1} failed with status {2} and message {3}",
+                                verb, requestUrl, e.Status, e.Message);
+                        }
                     }
-                    else
+                    catch (Exception e)
                     {
-                        m_log.ErrorFormat("[ASYNC REQUEST]: Request {0} {1} failed with status {2} and message {3}", verb, requestUrl, e.Status, e.Message);
+                        m_log.ErrorFormat(
+                            "[ASYNC REQUEST]: Request {0} {1} failed with exception {2}{3}",
+                            verb, requestUrl, e.Message, e.StackTrace);
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[ASYNC REQUEST]: Request {0} {1} failed with exception {2}", verb, requestUrl, e);
-                }
+    
+                    //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
 
-                //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
+                    try
+                    {
+                        action(deserial);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}{3}",
+                            verb, requestUrl, e.Message, e.StackTrace);
+                    }
+    
+                }, null);
+            }
 
-                try
-                {
-                    action(deserial);
-                }
-                catch (Exception e)
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+            {
+                string originalRequest = null;
+
+                if (buffer != null)
                 {
-                    m_log.ErrorFormat(
-                        "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}", verb, requestUrl, e);
+                    originalRequest = Encoding.UTF8.GetString(buffer.ToArray());
+
+                    if (originalRequest.Length > WebUtil.MaxRequestDiagLength)
+                        originalRequest = originalRequest.Remove(WebUtil.MaxRequestDiagLength);
                 }
 
-            }, null);
+                m_log.InfoFormat(
+                    "[ASYNC REQUEST]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    originalRequest);
+            }
         }
     }
 
     public static class SynchronousRestFormsRequester
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Perform a synchronous REST request.
@@ -814,6 +882,12 @@ namespace OpenSim.Framework
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static string MakeRequest(string verb, string requestUrl, string obj)
         {
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
+
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
             string respstring = String.Empty;
@@ -842,12 +916,16 @@ namespace OpenSim.Framework
                     }
                     catch (Exception e)
                     {
-                        m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: " + e.ToString(), requestUrl);
+                        m_log.DebugFormat(
+                            "[FORMS]: exception occured {0} {1}: {2}{3}", verb, requestUrl, e.Message, e.StackTrace);
                     }
                     finally
                     {
                         if (requestStream != null)
                             requestStream.Close();
+
+                        // capture how much time was spent writing
+                        tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                     }
                 }
 
@@ -868,7 +946,9 @@ namespace OpenSim.Framework
                             }
                             catch (Exception e)
                             {
-                                m_log.DebugFormat("[FORMS]: exception occured on receiving reply " + e.ToString());
+                                m_log.DebugFormat(
+                                    "[FORMS]: Exception occured on receiving {0} {1}: {2}{3}",
+                                    verb, requestUrl, e.Message, e.StackTrace);
                             }
                             finally
                             {
@@ -881,9 +961,21 @@ namespace OpenSim.Framework
                 catch (System.InvalidOperationException)
                 {
                     // This is what happens when there is invalid XML
-                    m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request");
+                    m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving {0} {1}", verb, requestUrl);
                 }
             }
+
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+                m_log.InfoFormat(
+                    "[FORMS]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
+
             return respstring;
         }
     }
@@ -911,6 +1003,12 @@ namespace OpenSim.Framework
 
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
         {
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
+
             Type type = typeof(TRequest);
             TResponse deserial = default(TResponse);
 
@@ -918,12 +1016,13 @@ namespace OpenSim.Framework
             request.Method = verb;
             if (pTimeout != 0)
                 request.Timeout = pTimeout * 1000;
+            MemoryStream buffer = null;
 
             if ((verb == "POST") || (verb == "PUT"))
             {
                 request.ContentType = "text/xml";
 
-                MemoryStream buffer = new MemoryStream();
+                buffer = new MemoryStream();
 
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
@@ -946,13 +1045,19 @@ namespace OpenSim.Framework
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); 
+                    m_log.DebugFormat(
+                        "[SynchronousRestObjectRequester]: Exception in making request {0} {1}: {2}{3}",
+                        verb, requestUrl, e.Message, e.StackTrace);
+
                     return deserial;
                 }
                 finally
                 {
                     if (requestStream != null)
                         requestStream.Close();
+
+                    // capture how much time was spent writing
+                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                 }
             }
 
@@ -968,7 +1073,11 @@ namespace OpenSim.Framework
                         respStream.Close();
                     }
                     else
-                        m_log.DebugFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb);
+                    {
+                        m_log.DebugFormat(
+                            "[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}",
+                            verb, requestUrl);
+                    }
                 }
             }
             catch (WebException e)
@@ -979,17 +1088,44 @@ namespace OpenSim.Framework
                     return deserial;
                 else
                     m_log.ErrorFormat(
-                        "[SynchronousRestObjectRequester]: WebException {0} {1} {2} {3}",
-                        requestUrl, typeof(TResponse).ToString(), e.Message, e.StackTrace);
+                        "[SynchronousRestObjectRequester]: WebException for {0} {1} {2}: {3} {4}",
+                        verb, requestUrl, typeof(TResponse).ToString(), e.Message, e.StackTrace);
             }
             catch (System.InvalidOperationException)
             {
                 // This is what happens when there is invalid XML
-                m_log.DebugFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString());
+                m_log.DebugFormat(
+                    "[SynchronousRestObjectRequester]: Invalid XML from {0} {1} {2}",
+                    verb, requestUrl, typeof(TResponse).ToString());
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e);
+                m_log.DebugFormat(
+                    "[SynchronousRestObjectRequester]: Exception on response from {0} {1}: {2}{3}",
+                    verb, requestUrl, e.Message, e.StackTrace);
+            }
+
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+            {
+                string originalRequest = null;
+
+                if (buffer != null)
+                {
+                    originalRequest = Encoding.UTF8.GetString(buffer.ToArray());
+
+                    if (originalRequest.Length > WebUtil.MaxRequestDiagLength)
+                        originalRequest = originalRequest.Remove(WebUtil.MaxRequestDiagLength);
+                }
+
+                m_log.InfoFormat(
+                    "[SynchronousRestObjectRequester]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    originalRequest);
             }
 
             return deserial;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index fb1e831..daae3e6 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -225,7 +225,7 @@ namespace OpenSim
         /// </summary>
         private void RegisterConsoleCommands()
         {
-            m_console.Commands.AddCommand("Regions", false, "force update",
+            m_console.Commands.AddCommand("Objects", false, "force update",
                                           "force update",
                                           "Force the update of all objects on clients",
                                           HandleForceUpdate);
@@ -306,7 +306,7 @@ namespace OpenSim
                                           + " If this is not given then the oar is saved to region.oar in the current directory.",
                                           SaveOar);
 
-            m_console.Commands.AddCommand("Regions", false, "edit scale",
+            m_console.Commands.AddCommand("Objects", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
                                           "Change the scale of a named prim", HandleEditScale);
 
@@ -349,7 +349,7 @@ namespace OpenSim
                                           "show ratings",
                                           "Show rating data", HandleShow);
 
-            m_console.Commands.AddCommand("Regions", false, "backup",
+            m_console.Commands.AddCommand("Objects", false, "backup",
                                           "backup",
                                           "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand);
 
@@ -410,7 +410,7 @@ namespace OpenSim
                                           "modules unload <name>",
                                           "Unload a module", HandleModules);
 
-            m_console.Commands.AddCommand("Regions", false, "kill uuid",
+            m_console.Commands.AddCommand("Objects", false, "kill uuid",
                                           "kill uuid <UUID>",
                                           "Kill an object by UUID", KillUUID);
         }
@@ -618,10 +618,11 @@ namespace OpenSim
                 return;
             }
 
-            PopulateRegionEstateInfo(regInfo);
+            bool changed = PopulateRegionEstateInfo(regInfo);
             IScene scene;
             CreateRegion(regInfo, true, out scene);
-            regInfo.EstateSettings.Save();
+            if (changed)
+              regInfo.EstateSettings.Save();
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ddc7f10..0adb693 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -437,7 +437,7 @@ namespace OpenSim
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
             
             // TODO : Try setting resource for region xstats here on scene
-            MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
+            MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
             
             scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
             scene.EventManager.TriggerParcelPrimCountUpdate();
@@ -856,6 +856,9 @@ namespace OpenSim
                 return Util.UTF8.GetBytes("OK");
             }
 
+            public string Name { get { return "SimStatus"; } }
+            public string Description { get { return "Simulator Status"; } }
+
             public string ContentType
             {
                 get { return "text/plain"; }
@@ -880,6 +883,9 @@ namespace OpenSim
         {
             OpenSimBase m_opensim;
             string osXStatsURI = String.Empty;
+
+            public string Name { get { return "XSimStatus"; } }
+            public string Description { get { return "Simulator XStatus"; } }
         
             public XSimStatusHandler(OpenSimBase sim)
             {
@@ -920,6 +926,9 @@ namespace OpenSim
         {
             OpenSimBase m_opensim;
             string osUXStatsURI = String.Empty;
+
+            public string Name { get { return "UXSimStatus"; } }
+            public string Description { get { return "Simulator UXStatus"; } }
         
             public UXSimStatusHandler(OpenSimBase sim)
             {
@@ -1051,13 +1060,13 @@ namespace OpenSim
         /// Load the estate information for the provided RegionInfo object.
         /// </summary>
         /// <param name="regInfo"></param>
-        public void PopulateRegionEstateInfo(RegionInfo regInfo)
+        public bool PopulateRegionEstateInfo(RegionInfo regInfo)
         {
             if (EstateDataService != null)
                 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
 
             if (regInfo.EstateSettings.EstateID != 0)
-                return;
+                return false;   // estate info in the database did not change
 
             m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
             
@@ -1092,7 +1101,7 @@ namespace OpenSim
                     }
 
                     if (defaultEstateJoined)
-                        return;
+                        return true; // need to update the database
                     else
                         m_log.ErrorFormat(
                             "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
@@ -1154,8 +1163,10 @@ namespace OpenSim
                         MainConsole.Instance.Output("Joining the estate failed. Please try again.");
                     }
                 }
-            }
-        }
+            }
+
+            return true;        // need to update the database
+        }
     }
     
     public class OpenSimConfigSource
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index ef6dedb..d397893 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -158,7 +158,9 @@ namespace OpenSim.Region.ClientStack.Linden
             try
             {
                 // the root of all evil
-                m_HostCapsObj.RegisterHandler("SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest));
+                m_HostCapsObj.RegisterHandler(
+                    "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null));
+
                 m_log.DebugFormat(
                     "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID);
 
@@ -166,7 +168,10 @@ namespace OpenSim.Region.ClientStack.Linden
                 //    new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
                 //                                                                capsBase + m_mapLayerPath,
                 //                                                                GetMapLayer);
-                IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
+                IRequestHandler req
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory, "UpdateScript", null);
+
                 m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptTask", req);
             }
@@ -181,14 +186,22 @@ namespace OpenSim.Region.ClientStack.Linden
             try
             {
                 // I don't think this one works...
-                m_HostCapsObj.RegisterHandler("NewFileAgentInventory", new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
-                                                                                           capsBase + m_newInventory,
-                                                                                           NewAgentInventoryRequest));
-                IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
+                m_HostCapsObj.RegisterHandler(
+                    "NewFileAgentInventory",
+                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>(
+                        "POST",
+                        capsBase + m_newInventory,
+                        NewAgentInventoryRequest,
+                        "NewFileAgentInventory",
+                        null));
+
+                IRequestHandler req
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory, "Update*", null);
+
                 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
-                m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", new RestStreamHandler("POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard));
                 IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData);
                 m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler);
                 IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost);
@@ -197,6 +210,12 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler);
            
 
+
+                m_HostCapsObj.RegisterHandler(
+                    "CopyInventoryFromNotecard",
+                    new RestStreamHandler(
+                        "POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null));
+             
                 // As of RC 1.22.9 of the Linden client this is
                 // supported
 
@@ -245,7 +264,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
             {
-                m_log.DebugFormat("[CAPS]: Unauthorized CAPS client");
+                m_log.DebugFormat(
+                    "[CAPS]: Unauthorized CAPS client {0} from {1}",
+                    m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint);
+
                 return string.Empty;
             }
 
@@ -296,7 +318,9 @@ namespace OpenSim.Region.ClientStack.Linden
                         m_dumpAssetsToFile);
                 uploader.OnUpLoad += TaskScriptUpdated;
 
-                m_HostCapsObj.HttpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                m_HostCapsObj.HttpListener.AddStreamHandler(
+                    new BinaryStreamHandler(
+                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null));
 
                 string protocol = "http://";
 
@@ -423,8 +447,14 @@ namespace OpenSim.Region.ClientStack.Linden
             AssetUploader uploader =
                 new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
                                   llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile);
+
             m_HostCapsObj.HttpListener.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST",
+                    capsBase + uploaderPath,
+                    uploader.uploaderCaps,
+                    "NewAgentInventoryRequest",
+                    m_HostCapsObj.AgentID.ToString()));
 
             string protocol = "http://";
 
@@ -740,7 +770,8 @@ namespace OpenSim.Region.ClientStack.Linden
             uploader.OnUpLoad += ItemUpdated;
 
             m_HostCapsObj.HttpListener.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST", capsBase + uploaderPath, uploader.uploaderCaps, "NoteCardAgentInventory", null));
 
             string protocol = "http://";
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index a91b02c..a38d231 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -351,14 +351,18 @@ namespace OpenSim.Region.ClientStack.Linden
             // EventQueueGet when it receive capability information, but then we replace the rest handler immediately
             // afterwards with the poll service.  So for now, we'll pass a null instead to simplify code reading, but
             // really it should be possible to directly register the poll handler as a capability.
-            caps.RegisterHandler("EventQueueGet",
-                                 new RestHTTPHandler("POST", capsBase + EventQueueGetUUID.ToString() + "/", null));
+            caps.RegisterHandler(
+                "EventQueueGet",
+                new RestHTTPHandler(
+                    "POST", capsBase + EventQueueGetUUID.ToString() + "/", null));
+
 //                                                       delegate(Hashtable m_dhttpMethod)
 //                                                       {
 //                                                           return ProcessQueue(m_dhttpMethod, agentID, caps);
 //                                                       }));
 
             // This will persist this beyond the expiry of the caps handlers
+            // TODO: Add EventQueueGet name/description for diagnostics
             MainServer.Instance.AddPollServiceHTTPHandler(
                 capsBase + EventQueueGetUUID.ToString() + "/",
                 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index a5209b7..c25b58c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             CapabilitiesModule capsModule = new CapabilitiesModule();
             EventQueueGetModule eqgModule = new EventQueueGetModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
index 14501c7..cb5afcc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
@@ -132,7 +132,8 @@ namespace OpenSim.Region.ClientStack.Linden
                 capUrl = "/CAPS/" + UUID.Random();
 
                 IRequestHandler reqHandler
-                    = new RestStreamHandler("POST", capUrl, m_fetchHandler.FetchInventoryRequest);
+                    = new RestStreamHandler(
+                        "POST", capUrl, m_fetchHandler.FetchInventoryRequest, capName, agentID.ToString());
 
                 caps.RegisterHandler(capName, reqHandler);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index e7bd2e7..0d7b1fc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -120,11 +120,13 @@ namespace OpenSim.Region.ClientStack.Linden
             {
 //                m_log.DebugFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
                 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-                IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
-                                                           delegate(Hashtable m_dhttpMethod)
-                                                           {
-                                                               return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
-                                                           });
+                IRequestHandler reqHandler
+                    = new RestHTTPHandler(
+                        "GET",
+                        "/CAPS/" + UUID.Random(),
+                        httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
+                        "GetMesh",
+                        agentID.ToString());
 
                 caps.RegisterHandler("GetMesh", reqHandler);
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index fffcee2..5ae9cc3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -130,7 +130,9 @@ namespace OpenSim.Region.ClientStack.Linden
             if (m_URL == "localhost")
             {
 //                m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler("GetTexture", new GetTextureHandler("/CAPS/" + capID + "/", m_assetService));
+                caps.RegisterHandler(
+                    "GetTexture",
+                    new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString()));
             }
             else
             {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 18c7eae..44a6883 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -117,7 +117,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag);
+            IRequestHandler reqHandler
+                = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag, "MeshUploadFlag", agentID.ToString());
+
             caps.RegisterHandler("MeshUploadFlag", reqHandler);
                 m_agentID = agentID;
         }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
index 91872c5..52c4f44 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
@@ -115,67 +115,66 @@ namespace OpenSim.Region.ClientStack.Linden
             UUID capID = UUID.Random();
 
 //            m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
-            caps.RegisterHandler("NewFileAgentInventoryVariablePrice",
-
-                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>("POST",
-                                                                                           "/CAPS/" + capID.ToString(),
-                                                                                           delegate(LLSDAssetUploadRequest req)
-                                                       {
-                                                           return NewAgentInventoryRequest(req,agentID);
-                                                       }));
-         
+            caps.RegisterHandler(
+                "NewFileAgentInventoryVariablePrice",
+                new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>(
+                    "POST",
+                    "/CAPS/" + capID.ToString(),
+                    req => NewAgentInventoryRequest(req, agentID),
+                    "NewFileAgentInventoryVariablePrice",
+                    agentID.ToString()));         
         }
 
         #endregion
 
         public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
         {
-
             //TODO:  The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
-            // You need to be aware of this and 
-
+            // you need to be aware of this
 
             //if (llsdRequest.asset_type == "texture" ||
            //     llsdRequest.asset_type == "animation" ||
            //     llsdRequest.asset_type == "sound")
            // {
                 // check user level
-                ScenePresence avatar = null;
-                IClientAPI client = null;
-                m_scene.TryGetScenePresence(agentID, out avatar);
 
-                if (avatar != null)
+            ScenePresence avatar = null;
+            IClientAPI client = null;
+            m_scene.TryGetScenePresence(agentID, out avatar);
+
+            if (avatar != null)
+            {
+                client = avatar.ControllingClient;
+
+                if (avatar.UserLevel < m_levelUpload)
                 {
-                    client = avatar.ControllingClient;
-
-                    if (avatar.UserLevel < m_levelUpload)
-                    {
-                        if (client != null)
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
-
-                        LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-                        errorResponse.rsvp = "";
-                        errorResponse.state = "error";
-                        return errorResponse;
-                    }
+                    if (client != null)
+                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
+
+                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
+                    errorResponse.rsvp = "";
+                    errorResponse.state = "error";
+                    return errorResponse;
                 }
+            }
 
-                // check funds
-                IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
+            // check funds
+            IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
 
-                if (mm != null)
+            if (mm != null)
+            {
+                if (!mm.UploadCovered(agentID, mm.UploadCharge))
                 {
-                    if (!mm.UploadCovered(agentID, mm.UploadCharge))
-                    {
-                        if (client != null)
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
-
-                        LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-                        errorResponse.rsvp = "";
-                        errorResponse.state = "error";
-                        return errorResponse;
-                    }
+                    if (client != null)
+                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+
+                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
+                    errorResponse.rsvp = "";
+                    errorResponse.state = "error";
+                    return errorResponse;
                 }
+            }
+
            // }
 
             string assetName = llsdRequest.name;
@@ -189,8 +188,14 @@ namespace OpenSim.Region.ClientStack.Linden
             AssetUploader uploader =
                 new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
                                   llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile);
+
             MainServer.Instance.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST",
+                    capsBase + uploaderPath,
+                    uploader.uploaderCaps,
+                    "NewFileAgentInventoryVariablePrice",
+                    agentID.ToString()));
 
             string protocol = "http://";
 
@@ -199,10 +204,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
             string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase +
                                  uploaderPath;
-         
+
 
             LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-           
             
             uploadResponse.rsvp = uploaderURL;
             uploadResponse.state = "upload";
@@ -220,6 +224,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                           pinventoryItem, pparentFolder, pdata,  pinventoryType,
                                           passetType,agentID);
                };
+
             return uploadResponse;
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 1c47f0e..4ccfc43 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -66,12 +66,14 @@ namespace OpenSim.Region.ClientStack.Linden
             
 //            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
 
-            caps.RegisterHandler("ObjectAdd",
-                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return ProcessAdd(m_dhttpMethod, agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "ObjectAdd",
+                new RestHTTPHandler(
+                    "POST",
+                    "/CAPS/OA/" + capuuid + "/",
+                    httpMethod => ProcessAdd(httpMethod, agentID, caps),
+                    "ObjectAdd",
+                    agentID.ToString()));;
         }
 
         public Hashtable ProcessAdd(Hashtable request, UUID AgentId, Caps cap)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 7a3d97e..f0f3984 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -106,12 +106,15 @@ namespace OpenSim.Region.ClientStack.Linden
             UUID capID = UUID.Random();
 
 //            m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID);
-            caps.RegisterHandler("UploadObjectAsset",
-                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/",
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return ProcessAdd(m_dhttpMethod, agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "UploadObjectAsset",
+                new RestHTTPHandler(
+                    "POST",
+                    "/CAPS/OA/" + capID + "/",
+                    httpMethod => ProcessAdd(httpMethod, agentID, caps),
+                    "UploadObjectAsset",
+                    agentID.ToString()));
+
             /*
                    caps.RegisterHandler("NewFileAgentInventoryVariablePrice",
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 1dd8938..8ed0fb3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -154,7 +154,9 @@ namespace OpenSim.Region.ClientStack.Linden
         public void RegisterCaps(UUID agentID, Caps caps)
         {
             IRequestHandler reqHandler
-                = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), HandleSimulatorFeaturesRequest);
+                = new RestHTTPHandler(
+                    "GET", "/CAPS/" + UUID.Random(),
+                    HandleSimulatorFeaturesRequest, "SimulatorFeatures", agentID.ToString());
 
             caps.RegisterHandler("SimulatorFeatures", reqHandler);
         }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 45d6071..b3d61a8 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -106,7 +106,9 @@ namespace OpenSim.Region.ClientStack.Linden
                     "POST",
                     "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
                     new UploadBakedTextureHandler(
-                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));
+                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+                    "UploadBakedTexture",
+                    agentID.ToString()));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 10f43d1..2359bd6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -144,7 +144,12 @@ namespace OpenSim.Region.ClientStack.Linden
                 capUrl = "/CAPS/" + UUID.Random();
 
                 IRequestHandler reqHandler
-                    = new RestStreamHandler("POST", capUrl, m_webFetchHandler.FetchInventoryDescendentsRequest);
+                    = new RestStreamHandler(
+                        "POST",
+                        capUrl,
+                        m_webFetchHandler.FetchInventoryDescendentsRequest,
+                        "FetchInventoryDescendents2",
+                        agentID.ToString());
 
                 caps.RegisterHandler(capName, reqHandler);
             }
@@ -160,4 +165,4 @@ namespace OpenSim.Region.ClientStack.Linden
 //                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7db6014..9ae8dfb 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12129,21 +12129,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID)
         {
             UUID requestID = UUID.Zero;
-            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
+            int sourceType = transferRequest.TransferInfo.SourceType;
+
+            if (sourceType == (int)SourceType.Asset)
             {
                 requestID = new UUID(transferRequest.TransferInfo.Params, 0);
             }
-            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
+            else if (sourceType == (int)SourceType.SimInventoryItem)
             {
                 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
             }
-            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            else if (sourceType == (int)SourceType.SimEstate)
             {
                 requestID = taskID;
             }
 
-
-//            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
+//                requestID, taskID, (SourceType)sourceType, Name);
 
 
             //Note, the bool returned from the below function is useless since it is always false.
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 75f783b..dda4444 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -916,7 +916,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 UDPPacketBuffer buffer = (UDPPacketBuffer)array[0];
                 UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1];
 
-                m_log.DebugFormat("[LLUDPSERVER]: Handling UseCircuitCode request from {0}", buffer.RemoteEndPoint);
+                m_log.DebugFormat(
+                    "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} from {1}",
+                    uccp.CircuitCode.Code, buffer.RemoteEndPoint);
     
                 remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint;
     
@@ -1352,7 +1354,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             else
             {
-                m_log.DebugFormat("[LLUDPSERVER]: Dropping incoming {0} packet for dead client {1}", packet.Type, udpClient.AgentID);
+                m_log.DebugFormat(
+                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
+                    packet.Type, udpClient.AgentID, m_scene.RegionInfo.RegionName);
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a575e36..1321470 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             TestHelpers.InMethod();
 //            XmlConfigurator.Configure();
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             uint myCircuitCode = 123456;
             UUID myAgentUuid   = TestHelpers.ParseTail(0x1);
             UUID mySessionUuid = TestHelpers.ParseTail(0x2);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 1b68d68..5fcf376 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -79,7 +79,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             J2KDecoderModule j2kdm = new J2KDecoderModule();
 
-            scene = SceneHelpers.SetupScene();
+            SceneHelpers sceneHelpers = new SceneHelpers();
+            scene = sceneHelpers.SetupScene();
             SceneHelpers.SetupSceneModules(scene, j2kdm);
 
             tc = new TestClient(SceneHelpers.GenerateAgentData(userId), scene);
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 6e3a58e..6e78d6d 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ClientStack
                     server.Start();
                 }
             }
-
+            
             base.StartupSpecific();
         }
 
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 127ca1d..7054825 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -83,7 +83,7 @@ namespace Flotsam.RegionModules.AssetCache
         private Dictionary<string, ManualResetEvent> m_CurrentlyWriting = new Dictionary<string, ManualResetEvent>();
         private int m_WaitOnInprogressTimeout = 3000;
 #else
-        private List<string> m_CurrentlyWriting = new List<string>();
+        private HashSet<string> m_CurrentlyWriting = new HashSet<string>();
 #endif
 
         private bool m_FileCacheEnabled = true;
@@ -272,7 +272,11 @@ namespace Flotsam.RegionModules.AssetCache
                         // the other thread has updated the time for us.
                         try
                         {
-                            File.SetLastAccessTime(filename, DateTime.Now);
+                            lock (m_CurrentlyWriting)
+                            {
+                                if (!m_CurrentlyWriting.Contains(filename))
+                                    File.SetLastAccessTime(filename, DateTime.Now);
+                            }
                         }
                         catch
                         {
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 5adb845..c91b25f 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
             config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true");
 
             m_cache = new FlotsamAssetCache();
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, m_cache);
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 78ae5e9..2bfe190 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -189,7 +189,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace);
+                    UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
+                    m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}",
+                        attach.ItemID, attach.AssetID, p, agentId, e.Message, e.StackTrace);
                 }
             }
         }
@@ -440,7 +442,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             lock (sp.AttachmentsSyncLock)
             {
                 // Save avatar attachment information
-                m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
+//                m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
 
                 bool changed = sp.Appearance.DetachAttachment(itemID);
                 if (changed && m_scene.AvatarFactory != null)
@@ -520,9 +522,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts()))
             {
-                m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
-                    grp.UUID, grp.AttachmentPoint);
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
+//                    grp.UUID, grp.AttachmentPoint);
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
 
@@ -553,12 +555,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
                 grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
-            else
-            {
-                m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
-                    grp.UUID, grp.AttachmentPoint);
-            }
+//            else
+//            {
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
+//                    grp.UUID, grp.AttachmentPoint);
+//            }
         }
 
         /// <summary>
@@ -576,9 +578,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private void AttachToAgent(
             IScenePresence sp, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
         {
-            //            m_log.DebugFormat(
-            //                "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} in pt {2} pos {3} {4}",
-            //                so.Name, avatar.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
+//            m_log.DebugFormat(
+//                "[ATTACHMENTS MODULE]: Adding attachment {0} to avatar {1} in pt {2} pos {3} {4}",
+//                so.Name, sp.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
 
             so.DetachFromBackup();
 
@@ -843,9 +845,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="att"></param>
         private void ShowAttachInUserInventory(IScenePresence sp, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
         {
-            //            m_log.DebugFormat(
-            //                "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
-            //                att.Name, sp.Name, AttachmentPt, itemID);
+//            m_log.DebugFormat(
+//                "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
+//                att.Name, sp.Name, AttachmentPt, itemID);
 
             if (UUID.Zero == itemID)
             {
@@ -908,9 +910,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         private void Client_OnObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
         {
-            //            m_log.DebugFormat(
-            //                "[ATTACHMENTS MODULE]: Attaching object local id {0} to {1} point {2} from ground (silent = {3})",
-            //                objectLocalID, remoteClient.Name, AttachmentPt, silent);
+//            m_log.DebugFormat(
+//                "[ATTACHMENTS MODULE]: Attaching object local id {0} to {1} point {2} from ground (silent = {3})",
+//                objectLocalID, remoteClient.Name, AttachmentPt, silent);
 
             if (!Enabled)
                 return;
@@ -946,13 +948,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 // Calls attach with a Zero position
                 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
                 {
-                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
+//                    m_log.Debug(
+//                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
+//                        + ", AttachmentPoint: " + AttachmentPt);
 
                     // Save avatar attachment information
-                    m_log.Debug(
-                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
-                        + ", AttachmentPoint: " + AttachmentPt);
-
+                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
                 }
             }
             catch (Exception e)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index bfe5e4a..42d07fd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             config.AddConfig("Modules");
             config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
 
-            scene = SceneHelpers.SetupScene();
+            scene = new SceneHelpers().SetupScene();
             m_attMod = new AttachmentsModule();
             SceneHelpers.SetupSceneModules(scene, config, m_attMod, new BasicInventoryAccessModule());
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 2bebd30..875c073 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
-                    m_log.InfoFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
+//                    m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
 
 //                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
@@ -208,7 +208,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             ScenePresence sp = m_scene.GetScenePresence(agentId);
             if (sp == null)
             {
-                m_log.WarnFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
+                // This is expected if the user has gone away.
+//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
                 return false;
             }
 
@@ -248,10 +249,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (bakedTextureFace == null)
                 {
-                    m_log.WarnFormat(
-                        "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
-                        bakeType, sp.Name, m_scene.RegionInfo.RegionName);
-
+                    // This can happen legitimately, since some baked textures might not exist
+                    //m_log.WarnFormat(
+                    //    "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
+                    //    bakeType, sp.Name, m_scene.RegionInfo.RegionName);
                     continue;
                 }
 
@@ -337,7 +338,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     return false;
             }
 
-            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
+//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
 
             // If we only found default textures, then the appearance is not cached
             return (defonly ? false : true);
@@ -370,11 +371,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (missingTexturesOnly)
                 {
                     if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                    {
                         continue;
+                    }
                     else
+                    {
+                        // On inter-simulator teleports, this occurs if baked textures are not being stored by the
+                        // grid asset service (which means that they are not available to the new region and so have
+                        // to be re-requested from the client).
+                        //
+                        // The only available core OpenSimulator behaviour right now
+                        // is not to store these textures, temporarily or otherwise.
                         m_log.DebugFormat(
                             "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
                             face.TextureID, idx, sp.Name);
+                    }
                 }
                 else
                 {
@@ -417,7 +428,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                    acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
 
                 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
-                bakedTextures[bakeType] = faceTextures[ftIndex];
+                Primitive.TextureEntryFace texture = faceTextures[ftIndex];    // this will be null if there's no such baked texture
+                bakedTextures[bakeType] = texture;
             }
 
             return bakedTextures;
@@ -482,7 +494,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             ScenePresence sp = m_scene.GetScenePresence(agentid);
             if (sp == null)
             {
-                m_log.WarnFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
+                // This is expected if the user has gone away.
+//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
                 return;
             }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 11a0a86..848b3bf 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             UUID userId = TestHelpers.ParseTail(0x1);
 
             AvatarFactoryModule afm = new AvatarFactoryModule();
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             CoreAssetCache assetCache = new CoreAssetCache();
             
             AvatarFactoryModule afm = new AvatarFactoryModule();
-            TestScene scene = SceneHelpers.SetupScene(assetCache);
+            TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 4d8fb90..6ffc7e6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             string fromName = c.From;
             string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
+            UUID targetID = c.TargetUUID;
             string message = c.Message;
             IScene scene = c.Scene;
             Vector3 fromPos = c.Position;
@@ -235,17 +236,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}, targetID {5}",
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-            
+
             foreach (Scene s in m_scenes)
             {
-                // This should use ForEachClient, but clients don't have a position.
-                // If camera is moved into client, then camera position can be used
-                s.ForEachRootScenePresence(
-                    delegate(ScenePresence presence)
+                if (targetID == UUID.Zero)
+                {
+                    // This should use ForEachClient, but clients don't have a position.
+                    // If camera is moved into client, then camera position can be used
+                    s.ForEachRootScenePresence(
+                        delegate(ScenePresence presence)
+                        {
+                            if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType, false))
+                                receiverIDs.Add(presence.UUID);
+                        }
+                    );
+                }
+                else
+                {
+                    // This is a send to a specific client eg from llRegionSayTo
+                    // no need to check distance etc, jand send is as say
+                    ScenePresence presence = s.GetScenePresence(targetID);
+                    if (presence != null && !presence.IsChildAgent)
                     {
                         ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
                         if (Presencecheck != null)
@@ -256,15 +271,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             // objects on a parcel with access restrictions
                             if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
                             {
-                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
+                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType, false))
                                     receiverIDs.Add(presence.UUID);
                             }
                         }
-
                     }
-                );
+                }
             }
-            
+
             (scene as Scene).EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
@@ -344,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// precondition</returns>
         protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
                                                   UUID fromAgentID, string fromName, ChatTypeEnum type,
-                                                  string message, ChatSourceType src)
+                                                  string message, ChatSourceType src, bool ignoreDistance)
         {
             // don't send stuff to child agents
             if (presence.IsChildAgent) return false;
@@ -355,12 +369,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
 
             int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
-            
-            if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
-                type == ChatTypeEnum.Say && dis > m_saydistance ||
-                type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+
+            if (!ignoreDistance)
             {
-                return false;
+                if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
+                    type == ChatTypeEnum.Say && dis > m_saydistance ||
+                    type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+                {
+                    return false;
+                }
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 0babeb5..3a91465 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -96,6 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             ScenePresence killingAvatar = null;
 //            string killingAvatarMessage;
 
+            // check to see if it is an NPC and just remove it
+            INPCModule NPCmodule = deadAvatar.Scene.RequestModuleInterface<INPCModule>();
+            if (NPCmodule != null && NPCmodule.DeleteNPC(deadAvatar.UUID, deadAvatar.Scene))
+            {
+                return;
+            }
+
             if (killerObjectLocalID == 0)
                 deadAvatarMessage = "You committed suicide!";
             else
@@ -145,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             catch (InvalidOperationException)
             { }
 
-            deadAvatar.Health = 100;
+            deadAvatar.setHealthWithUpdate(100.0f);
             deadAvatar.Scene.TeleportClientHome(deadAvatar.UUID, deadAvatar.ControllingClient);
         }
 
@@ -154,14 +161,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             try
             {
                 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-                
-                if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
+                if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
+                    || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
                 {
                     avatar.Invulnerable = false;
                 }
                 else
                 {
                     avatar.Invulnerable = true;
+                    if (avatar.Health < 100.0f)
+                    {
+                        avatar.setHealthWithUpdate(100.0f);
+                    }
                 }
             }
             catch (Exception)
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index f64c161..24ec435 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }            
         }
 
-        protected void InitModule(IConfigSource config)
+        protected virtual void InitModule(IConfigSource config)
         {
             IConfig friendsConfig = config.Configs["Friends"];
             if (friendsConfig != null)
@@ -449,29 +449,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         /// </summary>
         public IClientAPI LocateClientObject(UUID agentID)
         {
-            Scene scene = GetClientScene(agentID);
-            if (scene != null)
-            {
-                ScenePresence presence = scene.GetScenePresence(agentID);
-                if (presence != null)
-                    return presence.ControllingClient;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Find the scene for an agent
-        /// </summary>
-        private Scene GetClientScene(UUID agentId)
-        {
             lock (m_Scenes)
             {
                 foreach (Scene scene in m_Scenes)
                 {
-                    ScenePresence presence = scene.GetScenePresence(agentId);
+                    ScenePresence presence = scene.GetScenePresence(agentID);
                     if (presence != null && !presence.IsChildAgent)
-                        return scene;
+                        return presence.ControllingClient;
                 }
             }
 
@@ -498,7 +482,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 Util.FireAndForget(
                     delegate
                     {
-                        m_log.DebugFormat("[FRIENDS MODULE]: Notifying {0} friends", friendList.Count);
+                        m_log.DebugFormat(
+                            "[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}",
+                            friendList.Count, agentID, online);
+
                         // Notify about this user status
                         StatusNotify(friendList, agentID, online);
                     }
@@ -515,7 +502,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 {
                     // Try local
                     if (LocalStatusNotification(userID, friendID, online))
-                        return;
+                        continue;
 
                     // The friend is not here [as root]. Let's forward.
                     PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
@@ -523,11 +510,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     {
                         PresenceInfo friendSession = null;
                         foreach (PresenceInfo pinfo in friendSessions)
+                        {
                             if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad
                             {
                                 friendSession = pinfo;
                                 break;
                             }
+                        }
 
                         if (friendSession != null)
                         {
@@ -546,7 +535,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
-        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
+        protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
             { 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 9a6d277..3728b85 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -50,6 +50,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private int m_levelHGFriends = 0;
+
         IUserManagement m_uMan;
         public IUserManagement UserManagementModule
         {
@@ -87,6 +89,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 m_StatusNotifier = new HGStatusNotifier(this);
         }
 
+        protected override void InitModule(IConfigSource config)
+        {
+            base.InitModule(config);
+
+            // Additionally to the base method
+            IConfig friendsConfig = config.Configs["HGFriendsModule"];
+            if (friendsConfig != null)
+            {
+                m_levelHGFriends = friendsConfig.GetInt("LevelHGFriends", 0);
+
+                // TODO: read in all config variables pertaining to
+                // HG friendship permissions
+            }
+        }
+
         #endregion
 
         #region IFriendsSimConnector
@@ -105,6 +122,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         #endregion
 
+        protected override void OnInstantMessage(IClientAPI client, GridInstantMessage im)
+        {
+            if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
+            {
+                // we got a friendship offer
+                UUID principalID = new UUID(im.fromAgentID);
+                UUID friendID = new UUID(im.toAgentID);
+
+                // Check if friendID is foreigner and if principalID has the permission
+                // to request friendships with foreigners. If not, return immediately.
+                if (!UserManagementModule.IsLocalGridUser(friendID))
+                {
+                    ScenePresence avatar = null;
+                    ((Scene)client.Scene).TryGetScenePresence(principalID, out avatar);
+
+                    if (avatar == null)
+                        return;
+
+                    if (avatar.UserLevel < m_levelHGFriends)
+                    {
+                        client.SendAgentAlertMessage("Unable to send friendship invitation to foreigner. Insufficient permissions.", false);
+                        return;
+                    }
+                }
+            }
+
+            base.OnInstantMessage(client, im);
+        }
+
         protected override void OnApproveFriendRequest(IClientAPI client, UUID friendID, List<UUID> callingCardFolders)
         {
             // Update the local cache. Yes, we need to do it right here
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index 45b4264..7a197f7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
             config.AddConfig("FriendsService");
             config.Configs["FriendsService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             m_fm = new FriendsModule();
             SceneHelpers.SetupSceneModules(m_scene, config, m_fm);
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 8560c73..6587ead 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -39,6 +39,9 @@ using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Archiver;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using Ionic.Zlib;
+using GZipStream = Ionic.Zlib.GZipStream;
+using CompressionMode = Ionic.Zlib.CompressionMode;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
@@ -91,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Constructor
         /// </summary>
         public InventoryArchiveWriteRequest(
-            Guid id, InventoryArchiverModule module, Scene scene, 
+            Guid id, InventoryArchiverModule module, Scene scene,
             UserAccount userInfo, string invPath, string savePath)
             : this(
                 id,
@@ -99,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 scene,
                 userInfo,
                 invPath,
-                new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress))
+                new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression))
         {
         }
 
@@ -107,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Constructor
         /// </summary>
         public InventoryArchiveWriteRequest(
-            Guid id, InventoryArchiverModule module, Scene scene, 
+            Guid id, InventoryArchiverModule module, Scene scene,
             UserAccount userInfo, string invPath, Stream saveStream)
         {
             m_id = id;
@@ -125,7 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             Exception reportedException = null;
             bool succeeded = true;
-             
+
             try
             {
                 m_archiveWriter.Close();
@@ -146,6 +149,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService)
         {
+            if (options.ContainsKey("exclude"))
+            {
+                if (((List<String>)options["exclude"]).Contains(inventoryItem.Name) ||
+                    ((List<String>)options["exclude"]).Contains(inventoryItem.ID.ToString()))
+                {
+                    if (options.ContainsKey("verbose"))
+                    {
+                        m_log.InfoFormat(
+                            "[INVENTORY ARCHIVER]: Skipping inventory item {0} {1} at {2}",
+                            inventoryItem.Name, inventoryItem.ID, path);
+                    }
+                    return;
+                }
+            }
+
             if (options.ContainsKey("verbose"))
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Saving item {0} {1} with asset {2}",
@@ -175,9 +193,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <param name="options"></param>
         /// <param name="userAccountService"></param>
         protected void SaveInvFolder(
-            InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself, 
+            InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself,
             Dictionary<string, object> options, IUserAccountService userAccountService)
         {
+            if (options.ContainsKey("excludefolders"))
+            {
+                if (((List<String>)options["excludefolders"]).Contains(inventoryFolder.Name) ||
+                    ((List<String>)options["excludefolders"]).Contains(inventoryFolder.ID.ToString()))
+                {
+                    if (options.ContainsKey("verbose"))
+                    {
+                        m_log.InfoFormat(
+                            "[INVENTORY ARCHIVER]: Skipping folder {0} at {1}",
+                            inventoryFolder.Name, path);
+                    }
+                    return;
+                }
+            }
+
+            if (options.ContainsKey("verbose"))
+                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving folder {0}", inventoryFolder.Name);
+
             if (saveThisFolderItself)
             {
                 path += CreateArchiveFolderName(inventoryFolder);
@@ -186,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_archiveWriter.WriteDir(path);
             }
 
-            InventoryCollection contents 
+            InventoryCollection contents
                 = m_scene.InventoryService.GetFolderContent(inventoryFolder.Owner, inventoryFolder.ID);
 
             foreach (InventoryFolderBase childFolder in contents.Folders)
@@ -213,16 +249,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 InventoryFolderBase inventoryFolder = null;
                 InventoryItemBase inventoryItem = null;
                 InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID);
-    
+
                 bool saveFolderContentsOnly = false;
-    
+
                 // Eliminate double slashes and any leading / on the path.
                 string[] components
                     = m_invPath.Split(
                         new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
-    
+
                 int maxComponentIndex = components.Length - 1;
-    
+
                 // If the path terminates with a STAR then later on we want to archive all nodes in the folder but not the
                 // folder itself.  This may get more sophisicated later on
                 if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
@@ -230,13 +266,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     saveFolderContentsOnly = true;
                     maxComponentIndex--;
                 }
-    
+
                 m_invPath = String.Empty;
                 for (int i = 0; i <= maxComponentIndex; i++)
                 {
                     m_invPath += components[i] + InventoryFolderImpl.PATH_DELIMITER;
                 }
-    
+
                 // Annoyingly Split actually returns the original string if the input string consists only of delimiters
                 // Therefore if we still start with a / after the split, then we need the root folder
                 if (m_invPath.Length == 0)
@@ -246,25 +282,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 else
                 {
                     m_invPath = m_invPath.Remove(m_invPath.LastIndexOf(InventoryFolderImpl.PATH_DELIMITER));
-                    List<InventoryFolderBase> candidateFolders 
+                    List<InventoryFolderBase> candidateFolders
                         = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, rootFolder, m_invPath);
                     if (candidateFolders.Count > 0)
                         inventoryFolder = candidateFolders[0];
                 }
-    
+
                 // The path may point to an item instead
                 if (inventoryFolder == null)
                     inventoryItem = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, rootFolder, m_invPath);
-    
+
                 if (null == inventoryFolder && null == inventoryItem)
                 {
-                    // We couldn't find the path indicated 
+                    // We couldn't find the path indicated
                     string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
                     Exception e = new InventoryArchiverException(errorMessage);
                     m_module.TriggerInventoryArchiveSaved(m_id, false, m_userInfo, m_invPath, m_saveStream, e);
                     throw e;
                 }
-            
+
                 m_archiveWriter = new TarArchiveWriter(m_saveStream);
 
                 m_log.InfoFormat("[INVENTORY ARCHIVER]: Adding control file to archive.");
@@ -278,10 +314,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     m_log.DebugFormat(
                         "[INVENTORY ARCHIVER]: Found folder {0} {1} at {2}",
-                        inventoryFolder.Name, 
-                        inventoryFolder.ID, 
+                        inventoryFolder.Name,
+                        inventoryFolder.ID,
                         m_invPath == String.Empty ? InventoryFolderImpl.PATH_DELIMITER : m_invPath);
-    
+
                     //recurse through all dirs getting dirs and files
                     SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !saveFolderContentsOnly, options, userAccountService);
                 }
@@ -290,10 +326,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     m_log.DebugFormat(
                         "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}",
                         inventoryItem.Name, inventoryItem.ID, m_invPath);
-    
+
                     SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH, options, userAccountService);
                 }
-            
+
                 // Don't put all this profile information into the archive right now.
                 //SaveUsers();
 
@@ -352,7 +388,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// These names are prepended with an inventory folder's UUID so that more than one folder can have the
         /// same name
-        /// 
+        ///
         /// <param name="folder"></param>
         /// <returns></returns>
         public static string CreateArchiveFolderName(InventoryFolderBase folder)
@@ -366,7 +402,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         ///
         /// These names are prepended with an inventory item's UUID so that more than one item can have the
         /// same name
-        /// 
+        ///
         /// <param name="item"></param>
         /// <returns></returns>
         public static string CreateArchiveItemName(InventoryItemBase item)
@@ -412,7 +448,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public string CreateControlFile(Dictionary<string, object> options)
         {
             int majorVersion, minorVersion;
-            
+
             if (options.ContainsKey("home"))
             {
                 majorVersion = 1;
@@ -422,10 +458,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 majorVersion = 0;
                 minorVersion = 3;
-            }            
-            
+            }
+
             m_log.InfoFormat("[INVENTORY ARCHIVER]: Creating version {0}.{1} IAR", majorVersion, minorVersion);
-            
+
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
             xtw.Formatting = Formatting.Indented;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index ac22c3f..cf87010 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -47,18 +47,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
     public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public string Name { get { return "Inventory Archiver Module"; } }
-        
+
         public bool IsSharedModule { get { return true; } }
 
         /// <value>
-        /// Enable or disable checking whether the iar user is actually logged in 
+        /// Enable or disable checking whether the iar user is actually logged in
         /// </value>
 //        public bool DisablePresenceChecks { get; set; }
-        
+
         public event InventoryArchiveSaved OnInventoryArchiveSaved;
-        
+
         /// <summary>
         /// The file to load and save inventory if no filename has been specified
         /// </summary>
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Pending save completions initiated from the console
         /// </value>
         protected List<Guid> m_pendingConsoleSaves = new List<Guid>();
-        
+
         /// <value>
         /// All scenes that this module knows about
         /// </value>
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
                 OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted;
-                
+
                 scene.AddCommand(
                     "Archiving", this, "load iar",
                     "load iar [-m|--merge] <first> <last> <inventory path> <password> [<IAR path>]",
@@ -119,11 +119,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     + "<IAR path> is the filesystem path or URI from which to load the IAR."
                     + string.Format("  If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
                     HandleLoadInvConsoleCommand);
-                
+
                 scene.AddCommand(
                     "Archiving", this, "save iar",
-                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-v|--verbose]",
-                    "Save user inventory archive (IAR).", 
+                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-e|--exclude=<name/uuid>] [-f|--excludefolder=<foldername/uuid>] [-v|--verbose]",
+                    "Save user inventory archive (IAR).",
                     "<first> is the user's first name.\n"
                     + "<last> is the user's last name.\n"
                     + "<inventory path> is the path inside the user's inventory for the folder/item to be saved.\n"
@@ -131,32 +131,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     + string.Format("  If this is not given then the filename {0} in the current directory is used.\n", DEFAULT_INV_BACKUP_FILENAME)
                     + "-h|--home=<url> adds the url of the profile service to the saved user information.\n"
                     + "-c|--creators preserves information about foreign creators.\n"
+                    + "-e|--exclude=<name/uuid> don't save the inventory item in archive" + Environment.NewLine
+                    + "-f|--excludefolder=<folder/uuid> don't save contents of the folder in archive" + Environment.NewLine
                     + "-v|--verbose extra debug messages.\n"
                     + "--noassets stops assets being saved to the IAR.",
                     HandleSaveInvConsoleCommand);
 
                 m_aScene = scene;
             }
-                        
+
             m_scenes[scene.RegionInfo.RegionID] = scene;
         }
 
         public void PostInitialise() {}
 
         public void Close() {}
-        
+
         /// <summary>
         /// Trigger the inventory archive saved event.
         /// </summary>
         protected internal void TriggerInventoryArchiveSaved(
-            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
+            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
             Exception reportedException)
         {
             InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
             if (handlerInventoryArchiveSaved != null)
                 handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException);
         }
-        
+
         public bool ArchiveInventory(
              Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
         {
@@ -164,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public bool ArchiveInventory(
-            Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream, 
+            Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream,
             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
@@ -188,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-                    
+
                         return true;
 //                    }
 //                    else
@@ -202,15 +204,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return false;
         }
-                        
+
         public bool ArchiveInventory(
-            Guid id, string firstName, string lastName, string invPath, string pass, string savePath, 
+            Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
                 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
-                
+
                 if (userInfo != null)
                 {
 //                    if (CheckPresence(userInfo.PrincipalID))
@@ -228,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-                    
+
                         return true;
 //                    }
 //                    else
@@ -239,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                    }
                 }
             }
-            
+
             return false;
         }
 
@@ -247,9 +249,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             return DearchiveInventory(firstName, lastName, invPath, pass, loadStream, new Dictionary<string, object>());
         }
-        
+
         public bool DearchiveInventory(
-            string firstName, string lastName, string invPath, string pass, Stream loadStream, 
+            string firstName, string lastName, string invPath, string pass, Stream loadStream,
             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
@@ -295,22 +297,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return false;
         }
-        
+
         public bool DearchiveInventory(
-             string firstName, string lastName, string invPath, string pass, string loadPath, 
+             string firstName, string lastName, string invPath, string pass, string loadPath,
              Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
                 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
-                
+
                 if (userInfo != null)
                 {
 //                    if (CheckPresence(userInfo.PrincipalID))
 //                    {
                         InventoryArchiveReadRequest request;
                         bool merge = (options.ContainsKey("merge") ? (bool)options["merge"] : false);
-                        
+
                         try
                         {
                             request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath, merge);
@@ -324,7 +326,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-                        
+
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -340,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return false;
         }
-        
+
         /// <summary>
         /// Load inventory from an inventory file archive
         /// </summary>
@@ -351,26 +353,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 Dictionary<string, object> options = new Dictionary<string, object>();
                 OptionSet optionSet = new OptionSet().Add("m|merge", delegate (string v) { options["merge"] = v != null; });
-                
+
                 List<string> mainParams = optionSet.Parse(cmdparams);
-                
+
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[INVENTORY ARCHIVER]: usage is load iar [-m|--merge] <first name> <last name> <inventory path> <user password> [<load file path>]");                    
+                        "[INVENTORY ARCHIVER]: usage is load iar [-m|--merge] <first name> <last name> <inventory path> <user password> [<load file path>]");
                     return;
                 }
-    
+
                 string firstName = mainParams[2];
                 string lastName = mainParams[3];
                 string invPath = mainParams[4];
                 string pass = mainParams[5];
                 string loadPath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME);
-    
+
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
                     loadPath, invPath, firstName, lastName);
-                
+
                 if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath, options))
                     m_log.InfoFormat(
                         "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
@@ -381,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
             }
         }
-        
+
         /// <summary>
         /// Save inventory to a file archive
         /// </summary>
@@ -398,6 +400,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
             ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
             ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; });
+            ops.Add("e|exclude=", delegate(string v)
+                {
+                    if (!options.ContainsKey("exclude"))
+                        options["exclude"] = new List<String>();
+                    ((List<String>)options["exclude"]).Add(v);
+                });
+            ops.Add("f|excludefolder=", delegate(string v)
+                {
+                    if (!options.ContainsKey("excludefolders"))
+                        options["excludefolders"] = new List<String>();
+                    ((List<String>)options["excludefolders"]).Add(v);
+                });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
@@ -406,10 +420,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[INVENTORY ARCHIVER]: usage is save iar [-h|--home=<url>] [--noassets] <first name> <last name> <inventory path> <user password> [<save file path>] [-c|--creators] [-v|--verbose]");
+                        "[INVENTORY ARCHIVER]: save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-e|--exclude=<name/uuid>] [-f|--excludefolder=<foldername/uuid>] [-v|--verbose]");
                     return;
                 }
-    
+
                 if (options.ContainsKey("home"))
                     m_log.WarnFormat("[INVENTORY ARCHIVER]: Please be aware that inventory archives with creator information are not compatible with OpenSim 0.7.0.2 and earlier.  Do not use the -home option if you want to produce a compatible IAR");
 
@@ -418,7 +432,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 string invPath = mainParams[4];
                 string pass = mainParams[5];
                 string savePath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME);
-    
+
                 m_log.InfoFormat(
                     "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}",
                     savePath, invPath, firstName, lastName);
@@ -433,9 +447,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
             }
         }
-        
+
         private void SaveInvConsoleCommandCompleted(
-            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
+            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
             Exception reportedException)
         {
             lock (m_pendingConsoleSaves)
@@ -445,7 +459,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 else
                     return;
             }
-            
+
             if (succeeded)
             {
                 m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0} {1}", userInfo.FirstName, userInfo.LastName);
@@ -453,11 +467,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             else
             {
                 m_log.ErrorFormat(
-                    "[INVENTORY ARCHIVER]: Archive save for {0} {1} failed - {2}", 
+                    "[INVENTORY ARCHIVER]: Archive save for {0} {1} failed - {2}",
                     userInfo.FirstName, userInfo.LastName, reportedException.Message);
             }
         }
-        
+
         /// <summary>
         /// Get user information for the given name.
         /// </summary>
@@ -467,13 +481,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         protected UserAccount GetUserInfo(string firstName, string lastName, string pass)
         {
-            UserAccount account 
+            UserAccount account
                 = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
-            
+
             if (null == account)
             {
                 m_log.ErrorFormat(
-                    "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}", 
+                    "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}",
                     firstName, lastName);
                 return null;
             }
@@ -488,7 +502,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 else
                 {
                     m_log.ErrorFormat(
-                        "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.", 
+                        "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect.  Please try again.",
                         firstName, lastName);
                     return null;
                 }
@@ -499,7 +513,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
         }
-        
+
         /// <summary>
         /// Notify the client of loaded nodes if they are logged in
         /// </summary>
@@ -508,22 +522,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             if (loadedNodes.Count == 0)
                 return;
-                   
+
             foreach (Scene scene in m_scenes.Values)
             {
                 ScenePresence user = scene.GetScenePresence(userInfo.PrincipalID);
-                
+
                 if (user != null && !user.IsChildAgent)
                 {
                     foreach (InventoryNodeBase node in loadedNodes)
                     {
 //                        m_log.DebugFormat(
-//                            "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}", 
+//                            "[INVENTORY ARCHIVER]: Notifying {0} of loaded inventory node {1}",
 //                            user.Name, node.Name);
-                        
+
                         user.ControllingClient.SendBulkUpdateInventory(node);
                     }
-                    
+
                     break;
                 }
             }
@@ -538,7 +552,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //        {
 //            if (DisablePresenceChecks)
 //                return true;
-//            
+//
 //            foreach (Scene scene in m_scenes.Values)
 //            {
 //                ScenePresence p;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 19ef571..90ae69d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //            log4net.Config.XmlConfigurator.Configure();
             
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, archiverModule);            
             
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index e409c8e..b112b6d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
         }
                 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
index 417c20c..6eb3605 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, archiverModule);
 
             // Create user
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
             
             // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
 
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
             
             UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, archiverModule);
 
             // Create user
@@ -326,7 +326,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
             
             Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
@@ -393,7 +393,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
             
             string folder1ExistingName = "a";
@@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
             
             string folder1ExistingName = "a";
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index bc5c1ff..92cf9d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -240,13 +240,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         {
                             ScenePresence sp = scene.GetScenePresence(client.AgentId);
                             IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
-                            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
-                            if (transferMod != null && sp != null && eq != null)
-                                transferMod.DoTeleport(sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), Vector3.UnitX, teleportflags, eq);
+
+                            if (transferMod != null && sp != null)
+                                transferMod.DoTeleport(
+                                    sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f),
+                                    Vector3.UnitX, teleportflags);
                         }
                     }
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index dcfdf8f..a889984 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -151,6 +151,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
             Scene scene = (Scene)(client.Scene);
             ScenePresence presence = scene.GetScenePresence(client.AgentId);
 
+            // Round up Z co-ordinate rather than round-down by casting.  This stops tall avatars from being given
+            // a teleport Z co-ordinate by short avatars that drops them through or embeds them in thin floors on
+            // arrival.
+            //
+            // Ideally we would give the exact float position adjusting for the relative height of the two avatars
+            // but it looks like a float component isn't possible with a parcel ID.
             UUID dest = Util.BuildFakeParcelID(
                     scene.RegionInfo.RegionHandle,
                     (uint)presence.AbsolutePosition.X,
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 2b790f4..514a65b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using System.Threading;
-
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Client;
@@ -51,17 +50,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public const int DefaultMaxTransferDistance = 4095;
+        public const bool EnableWaitForCallbackFromTeleportDestDefault = true;
+
         /// <summary>
         /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer.
         /// </summary>
-        private int m_MaxTransferDistance = 4095;
-        public int MaxTransferDistance
-        {
-            get { return m_MaxTransferDistance; }
-            set { m_MaxTransferDistance = value; }
-        }
+        public int MaxTransferDistance { get; set; }
 
-        private int m_levelHGTeleport = 0;
+        /// <summary>
+        /// If true then on a teleport, the source region waits for a callback from the destination region.  If
+        /// a callback fails to arrive within a set time then the user is pulled back into the source region.
+        /// </summary>
+        public bool EnableWaitForCallbackFromTeleportDest { get; set; }
 
         protected bool m_Enabled = false;
         protected Scene m_aScene;
@@ -105,8 +106,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             IConfig transferConfig = source.Configs["EntityTransfer"];
             if (transferConfig != null)
             {
-                MaxTransferDistance = transferConfig.GetInt("max_distance", 4095);
-                m_levelHGTeleport = transferConfig.GetInt("LevelHGTeleport", 0);
+                EnableWaitForCallbackFromTeleportDest
+                    = transferConfig.GetBoolean("wait_for_callback", EnableWaitForCallbackFromTeleportDestDefault);
+                
+                MaxTransferDistance = transferConfig.GetInt("max_distance", DefaultMaxTransferDistance);
+            }
+            else
+            {
+                MaxTransferDistance = DefaultMaxTransferDistance;
             }
 
             m_agentsInTransit = new List<UUID>();
@@ -164,168 +171,235 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public void Teleport(ScenePresence sp, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags)
         {
+            if (sp.Scene.Permissions.IsGridGod(sp.UUID))
+            {
+                // This user will be a God in the destination scene, too
+                teleportFlags |= (uint)TeleportFlags.Godlike;
+            }
+
             if (!sp.Scene.Permissions.CanTeleport(sp.UUID))
                 return;
 
-            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
-
             // Reset animations; the viewer does that in teleports.
             sp.Animator.ResetAnimations();
 
+            string destinationRegionName = "(not found)";
+
             try
             {
                 if (regionHandle == sp.Scene.RegionInfo.RegionHandle)
                 {
-                    m_log.DebugFormat(
-                        "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation {0} within {1}",
-                        position, sp.Scene.RegionInfo.RegionName);
+                    destinationRegionName = sp.Scene.RegionInfo.RegionName;
 
-                    // Teleport within the same region
-                    if (IsOutsideRegion(sp.Scene, position) || position.Z < 0)
-                    {
-                        Vector3 emergencyPos = new Vector3(128, 128, 128);
+                    TeleportAgentWithinRegion(sp, position, lookAt, teleportFlags);
+                }
+                else // Another region possibly in another simulator
+                {
+                    GridRegion finalDestination;
+                    TeleportAgentToDifferentRegion(
+                        sp, regionHandle, position, lookAt, teleportFlags, out finalDestination);
 
-                        m_log.WarnFormat(
-                            "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}.  Substituting {3}",
-                            position, sp.Name, sp.UUID, emergencyPos);
-                        position = emergencyPos;
-                    }
+                    if (finalDestination != null)
+                        destinationRegionName = finalDestination.RegionName;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[ENTITY TRANSFER MODULE]: Exception on teleport of {0} from {1}@{2} to {3}@{4}: {5}{6}",
+                    sp.Name, sp.AbsolutePosition, sp.Scene.RegionInfo.RegionName, position, destinationRegionName,
+                    e.Message, e.StackTrace);
 
-                    // TODO: Get proper AVG Height
-                    float localAVHeight = 1.56f;
-                    float posZLimit = 22;
+                // Make sure that we clear the in-transit flag so that future teleport attempts don't always fail.
+                ResetFromTransit(sp.UUID);
 
-                    // TODO: Check other Scene HeightField
-                    if (position.X > 0 && position.X <= (int)Constants.RegionSize && position.Y > 0 && position.Y <= (int)Constants.RegionSize)
-                    {
-                        posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
-                    }
+                sp.ControllingClient.SendTeleportFailed("Internal error");
+            }
+        }
 
-                    float newPosZ = posZLimit + localAVHeight;
-                    if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
-                    {
-                        position.Z = newPosZ;
-                    }
+        /// <summary>
+        /// Teleports the agent within its current region.
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <param name="position"></param>
+        /// <param name="lookAt"></param>
+        /// <param name="teleportFlags"></param
+        private void TeleportAgentWithinRegion(ScenePresence sp, Vector3 position, Vector3 lookAt, uint teleportFlags)
+        {
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Teleport for {0} to {1} within {2}",
+                sp.Name, position, sp.Scene.RegionInfo.RegionName);
 
-                    sp.ControllingClient.SendTeleportStart(teleportFlags);
+            // Teleport within the same region
+            if (IsOutsideRegion(sp.Scene, position) || position.Z < 0)
+            {
+                Vector3 emergencyPos = new Vector3(128, 128, 128);
 
-                    sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
-                    sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
-                    sp.Teleport(position);
+                m_log.WarnFormat(
+                    "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}.  Substituting {3}",
+                    position, sp.Name, sp.UUID, emergencyPos);
 
-                    foreach (SceneObjectGroup grp in sp.GetAttachments())
-                    {
-                        sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
-                    }
+                position = emergencyPos;
+            }
+
+            // TODO: Get proper AVG Height
+            float localAVHeight = 1.56f;
+            float posZLimit = 22;
+
+            // TODO: Check other Scene HeightField
+            if (position.X > 0 && position.X <= (int)Constants.RegionSize && position.Y > 0 && position.Y <= (int)Constants.RegionSize)
+            {
+                posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
+            }
+
+            float newPosZ = posZLimit + localAVHeight;
+            if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
+            {
+                position.Z = newPosZ;
+            }
+
+            sp.ControllingClient.SendTeleportStart(teleportFlags);
+
+            sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
+            sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
+            sp.Velocity = Vector3.Zero;
+            sp.Teleport(position);
+
+            foreach (SceneObjectGroup grp in sp.GetAttachments())
+            {
+                sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
+            }
+        }
+
+        /// <summary>
+        /// Teleports the agent to a different region.
+        /// </summary>
+        /// <param name='sp'></param>
+        /// <param name='regionHandle'>/param>
+        /// <param name='position'></param>
+        /// <param name='lookAt'></param>
+        /// <param name='teleportFlags'></param>
+        /// <param name='finalDestination'></param>
+        private void TeleportAgentToDifferentRegion(
+            ScenePresence sp, ulong regionHandle, Vector3 position,
+            Vector3 lookAt, uint teleportFlags, out GridRegion finalDestination)
+        {
+            uint x = 0, y = 0;
+            Utils.LongToUInts(regionHandle, out x, out y);
+            GridRegion reg = m_aScene.GridService.GetRegionByPosition(sp.Scene.RegionInfo.ScopeID, (int)x, (int)y);
+
+            if (reg != null)
+            {
+                finalDestination = GetFinalDestination(reg);
+
+                if (finalDestination == null)
+                {
+                    m_log.WarnFormat(
+                        "[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport {0} {1}",
+                        sp.Name, sp.UUID);
+
+                    sp.ControllingClient.SendTeleportFailed("Problem at destination");
+                    return;
                 }
-                else // Another region possibly in another simulator
+
+                // Check that these are not the same coordinates
+                if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
+                    finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY)
                 {
-                    uint x = 0, y = 0;
-                    Utils.LongToUInts(regionHandle, out x, out y);
-                    GridRegion reg = m_aScene.GridService.GetRegionByPosition(sp.Scene.RegionInfo.ScopeID, (int)x, (int)y);
+                    // Can't do. Viewer crashes
+                    sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again.");
+                    return;
+                }
 
-                    if (reg != null)
-                    {
-                        GridRegion finalDestination = GetFinalDestination(reg);
-                        if (finalDestination == null)
-                        {
-                            m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent.");
-                            sp.ControllingClient.SendTeleportFailed("Problem at destination");
-                            return;
-                        }
+                //
+                // This is it
+                //
+                DoTeleport(sp, reg, finalDestination, position, lookAt, teleportFlags);
+                //
+                //
+                //
+            }
+            else
+            {
+                finalDestination = null;
 
-                        // check if HyperGrid teleport is allowed, based on user level
-                        int flags = m_aScene.GridService.GetRegionFlags(sp.Scene.RegionInfo.ScopeID, reg.RegionID);
+                // TP to a place that doesn't exist (anymore)
+                // Inform the viewer about that
+                sp.ControllingClient.SendTeleportFailed("The region you tried to teleport to doesn't exist anymore");
 
-                        if (((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) && (sp.UserLevel < m_levelHGTeleport))
-                        {
-                            m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Final destination link is non permitted hypergrid region. Unable to teleport agent.");
-                            sp.ControllingClient.SendTeleportFailed("HyperGrid teleport not permitted");
-                            return;
-                        }
+                // and set the map-tile to '(Offline)'
+                uint regX, regY;
+                Utils.LongToUInts(regionHandle, out regX, out regY);
 
-                        uint curX = 0, curY = 0;
-                        Utils.LongToUInts(sp.Scene.RegionInfo.RegionHandle, out curX, out curY);
-                        int curCellX = (int)(curX / Constants.RegionSize);
-                        int curCellY = (int)(curY / Constants.RegionSize);
-                        int destCellX = (int)(finalDestination.RegionLocX / Constants.RegionSize);
-                        int destCellY = (int)(finalDestination.RegionLocY / Constants.RegionSize);
+                MapBlockData block = new MapBlockData();
+                block.X = (ushort)(regX / Constants.RegionSize);
+                block.Y = (ushort)(regY / Constants.RegionSize);
+                block.Access = 254; // == not there
 
+                List<MapBlockData> blocks = new List<MapBlockData>();
+                blocks.Add(block);
+                sp.ControllingClient.SendMapBlock(blocks, 0);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether this instance is within the max transfer distance.
+        /// </summary>
+        /// <param name="sourceRegion"></param>
+        /// <param name="destRegion"></param>
+        /// <returns>
+        /// <c>true</c> if this instance is within max transfer distance; otherwise, <c>false</c>.
+        /// </returns>
+        private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion)
+        {
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY);
 //
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final dest is x={0} y={1} {2}@{3}",
 //                            destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI);
 
-                        // Check that these are not the same coordinates
-                        if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
-                            finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY)
-                        {
-                            // Can't do. Viewer crashes
-                            sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again.");
-                            return;
-                        }
+            // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position.
+            return Math.Abs(sourceRegion.RegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance
+                && Math.Abs(sourceRegion.RegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance;
+        }
 
-                        if (Math.Abs(curCellX - destCellX) > MaxTransferDistance || Math.Abs(curCellY - destCellY) > MaxTransferDistance)
-                        {
-                            sp.ControllingClient.SendTeleportFailed(
-                                string.Format(
-                                  "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way",
-                                  finalDestination.RegionName, destCellX, destCellY,
-                                  sp.Scene.RegionInfo.RegionName, curCellX, curCellY,
-                                  MaxTransferDistance));
-
-                            return;
-                        }
+        public void DoTeleport(
+            ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+            Vector3 position, Vector3 lookAt, uint teleportFlags)
+        {
+            RegionInfo sourceRegion = sp.Scene.RegionInfo;
 
-                        //
-                        // This is it
-                        //
-                        DoTeleport(sp, reg, finalDestination, position, lookAt, teleportFlags, eq);
-                        //
-                        //
-                        //
-                    }
-                    else
-                    {
-                        // TP to a place that doesn't exist (anymore)
-                        // Inform the viewer about that
-                        sp.ControllingClient.SendTeleportFailed("The region you tried to teleport to doesn't exist anymore");
-
-                        // and set the map-tile to '(Offline)'
-                        uint regX, regY;
-                        Utils.LongToUInts(regionHandle, out regX, out regY);
-
-                        MapBlockData block = new MapBlockData();
-                        block.X = (ushort)(regX / Constants.RegionSize);
-                        block.Y = (ushort)(regY / Constants.RegionSize);
-                        block.Access = 254; // == not there
-
-                        List<MapBlockData> blocks = new List<MapBlockData>();
-                        blocks.Add(block);
-                        sp.ControllingClient.SendMapBlock(blocks, 0);
-                    }
-                }
-            }
-            catch (Exception e)
+            if (!IsWithinMaxTeleportDistance(sourceRegion, finalDestination))
             {
-                m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0} {1}", e.Message, e.StackTrace);
-                sp.ControllingClient.SendTeleportFailed("Internal error");
+                sp.ControllingClient.SendTeleportFailed(
+                    string.Format(
+                      "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way",
+                      finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY,
+                      sourceRegion.RegionName, sourceRegion.RegionLocX, sourceRegion.RegionLocY,
+                      MaxTransferDistance));
+
+                return;
             }
-        }
 
-        public void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq)
-        {
+            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
+
             if (reg == null || finalDestination == null)
             {
                 sp.ControllingClient.SendTeleportFailed("Unable to locate destination");
                 return;
             }
 
-            if (IsInTransit(sp.UUID)) // Avie is already on the way. Caller shouldn't do this.
+            if (!SetInTransit(sp.UUID)) // Avie is already on the way. Caller shouldn't do this.
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
+                    sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
+
                 return;
+            }
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Request Teleport to {0} ({1}) {2}/{3}",
+                "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2} to {3} ({4}) {5}/{6}",
+                sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName,
                 reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
 
             uint newRegionX = (uint)(reg.RegionHandle >> 40);
@@ -362,8 +436,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason))
                 {
                     sp.ControllingClient.SendTeleportFailed("Teleport failed: " + reason);
+                    ResetFromTransit(sp.UUID);
+
                     return;
                 }
+
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Destination is running version {0}", version);
 
                 sp.ControllingClient.SendTeleportStart(teleportFlags);
@@ -403,13 +480,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 bool logout = false;
                 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
                 {
-                    sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}",
-                                                                              reason));
+                    sp.ControllingClient.SendTeleportFailed(
+                        String.Format("Teleport refused: {0}", reason));
+                    ResetFromTransit(sp.UUID);
+
                     return;
                 }
 
                 // OK, it got this agent. Let's close some child agents
                 sp.CloseChildAgents(newRegionX, newRegionY);
+
                 IClientIPEndpoint ipepClient;  
                 if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
                 {
@@ -446,9 +526,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
                 }
 
-
-                SetInTransit(sp.UUID);
-
                 // Let's send a full update of the agent. This is a synchronous call.
                 AgentData agent = new AgentData();
                 sp.CopyTo(agent);
@@ -461,8 +538,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     // Region doesn't take it
                     m_log.WarnFormat(
-                        "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}.  Returning avatar to source region.", 
-                        sp.Name, finalDestination.RegionName);
+                        "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}.  Returning avatar to source region.",
+                        sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
                     
                     Fail(sp, finalDestination, logout);
                     return;
@@ -471,7 +548,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "sending_dest");
 
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
+                    "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
+                    capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
                 if (eq != null)
                 {
@@ -490,11 +568,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
                 // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
                 // that the client contacted the destination before we close things here.
-                if (!WaitForCallback(sp.UUID))
+                if (EnableWaitForCallbackFromTeleportDest && !WaitForCallback(sp.UUID))
                 {
                     m_log.WarnFormat(
-                        "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} failed due to no callback from destination region.  Returning avatar to source region.", 
-                        sp.Name, finalDestination.RegionName);
+                        "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} from {2} failed due to no callback from destination region.  Returning avatar to source region.",
+                        sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
                     
                     Fail(sp, finalDestination, logout);                   
                     return;
@@ -523,7 +601,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
                 {
-                    Thread.Sleep(5000);
+                    // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before
+                    // they regard the new region as the current region after receiving the AgentMovementComplete
+                    // response.  If close is sent before then, it will cause the viewer to quit instead.
+                    // However, if this delay is longer, then a viewer can teleport back to this region and experience
+                    // a failure because the old ScenePresence has not yet been cleaned up.
+                    Thread.Sleep(2000);
+
                     sp.Close();
                     sp.Scene.IncomingCloseAgent(sp.UUID);
                 }
@@ -584,13 +668,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         protected virtual void SetCallbackURL(AgentData agent, RegionInfo region)
         {
             agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/";
-            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Set callback URL to {0}", agent.CallbackURI);
 
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Set release callback URL to {0} in {1}",
+                agent.CallbackURI, region.RegionName);
         }
 
         protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
         {
-            sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true);
+            if (sp.Scene.AttachmentsModule != null)
+                sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true);
         }
 
         protected void KillEntity(Scene scene, uint localID)
@@ -615,7 +702,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual bool IsOutsideRegion(Scene s, Vector3 pos)
         {
-
             if (s.TestBorderCross(pos, Cardinals.N))
                 return true;
             if (s.TestBorderCross(pos, Cardinals.S))
@@ -663,7 +749,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public virtual bool TeleportHome(UUID id, IClientAPI client)
         {
-            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
 
             //OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId);
             GridUserInfo uinfo = m_aScene.GridUserService.GetGridUserInfo(client.AgentId.ToString());
@@ -684,8 +771,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return false;
                 }
                 
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", 
-                    regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize);
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
+                    client.Name, regionInfo.RegionName, regionInfo.RegionCoordX, regionInfo.RegionCoordY);
 
                 // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point...
                 ((Scene)(client.Scene)).RequestTeleportLocation(
@@ -736,7 +823,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 neighbourx--;
                 newpos.X = Constants.RegionSize - enterDistance;
-
             }
             else if (scene.TestBorderCross(pos + eastCross, Cardinals.E))
             {
@@ -1186,7 +1272,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
                 {
-
                     AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
                     AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
                     agent.BaseFolder = UUID.Zero;
@@ -1211,7 +1296,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         seeds.Add(neighbour.RegionHandle, agent.CapsPath);
                     }
                     else
+                    {
                         agent.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, neighbour.RegionHandle);
+                    }
 
                     cagents.Add(agent);
                 }
@@ -1322,19 +1409,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // after a cross here
             Thread.Sleep(500);
 
-            Scene m_scene = sp.Scene;
+            Scene scene = sp.Scene;
 
-            uint x, y;
-            Utils.LongToUInts(reg.RegionHandle, out x, out y);
-            x = x / Constants.RegionSize;
-            y = y / Constants.RegionSize;
-            m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint + ")");
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
+                sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY);
 
             string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath);
 
             string reason = String.Empty;
 
-            bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); 
+            bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason);
 
             if (regionAccepted && newAgent)
             {
@@ -1351,7 +1436,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                     m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbour region {2} @ {3} " +
                         "and EstablishAgentCommunication with seed cap {4}",
-                        m_scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath);
+                        scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath);
 
                     eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
                     eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
@@ -1362,8 +1447,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     // TODO: make Event Queue disablable!
                 }
 
-                m_log.Debug("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString());
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Completed inform {0} {1} about neighbour {2}", sp.Name, sp.UUID, endPoint);
             }
+
+            if (!regionAccepted)
+                m_log.WarnFormat(
+                    "[ENTITY TRANSFER MODULE]: Region {0} did not accept {1} {2}: {3}",
+                    reg.RegionName, sp.Name, sp.UUID, reason);
         }
 
         /// <summary>
@@ -1832,35 +1922,50 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             int count = 200;
             while (m_agentsInTransit.Contains(id) && count-- > 0)
             {
-                //m_log.Debug("  >>> Waiting... " + count);
+//                m_log.Debug("  >>> Waiting... " + count);
                 Thread.Sleep(100);
             }
 
-            if (count > 0)
-                return true;
-            else
-                return false;
+            return count > 0;
         }
 
-        protected void SetInTransit(UUID id)
+        /// <summary>
+        /// Set that an agent is in the process of being teleported.
+        /// </summary>
+        /// <param name='id'>The ID of the agent being teleported</param>
+        /// <returns>true if the agent was not already in transit, false if it was</returns>
+        protected bool SetInTransit(UUID id)
         {
             lock (m_agentsInTransit)
             {
                 if (!m_agentsInTransit.Contains(id))
+                {
                     m_agentsInTransit.Add(id);
+                    return true;
+                }
             }
+
+            return false;
         }
 
+        /// <summary>
+        /// Show whether the given agent is being teleported.
+        /// </summary>
+        /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns>
+        /// <param name='id'>The agent ID</para></param>
         protected bool IsInTransit(UUID id)
         {
             lock (m_agentsInTransit)
-            {
-                if (m_agentsInTransit.Contains(id))
-                    return true;
-            }
-            return false;
+                return m_agentsInTransit.Contains(id);
         }
 
+        /// <summary>
+        /// Set that an agent is no longer being teleported.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='id'>
+        /// true if the agent was flagged as being teleported when this method was called, false otherwise
+        /// </param>
         protected bool ResetFromTransit(UUID id)
         {
             lock (m_agentsInTransit)
@@ -1871,6 +1976,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -1901,4 +2007,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion
 
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 8b5ad23..6e27299 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Initialized = false;
+        private int m_levelHGTeleport = 0;
 
         private GatekeeperServiceConnector m_GatekeeperConnector;
 
@@ -68,6 +69,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 string name = moduleConfig.GetString("EntityTransferModule", "");
                 if (name == Name)
                 {
+                    IConfig transferConfig = source.Configs["EntityTransfer"];
+                    if (transferConfig != null)
+                        m_levelHGTeleport = transferConfig.GetInt("LevelHGTeleport", 0);
+
                     InitialiseCommon(source);
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
@@ -164,6 +169,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
             {
                 // this user is going to another grid
+                // check if HyperGrid teleport is allowed, based on user level
+                if (sp.UserLevel < m_levelHGTeleport)
+                {
+                    m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to HG teleport agent due to insufficient UserLevel.");
+                    reason = "Hypergrid teleport not allowed";
+                    return false;
+                }
+
                 if (agentCircuit.ServiceURLs.ContainsKey("HomeURI"))
                 {
                     string userAgentDriver = agentCircuit.ServiceURLs["HomeURI"].ToString();
@@ -193,7 +206,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
-            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
 
             // Let's find out if this is a foreign user or a local user
             IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); 
@@ -232,13 +246,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return false;
             }
 
-            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
             
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
-            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
+            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
             return true;
         }
 
@@ -279,17 +292,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     ScenePresence sp = scene.GetScenePresence(remoteClient.AgentId);
                     IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>();
-                    IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
-                    if (transferMod != null && sp != null && eq != null)
-                        transferMod.DoTeleport(sp, gatekeeper, finalDestination, lm.Position,
-                            Vector3.UnitX, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark), eq);
+
+                    if (transferMod != null && sp != null)
+                        transferMod.DoTeleport(
+                            sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX,
+                            (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));
                 }
 
             }
 
             // can't find the region: Tell viewer and abort
             remoteClient.SendTeleportFailed("The teleport destination could not be found.");
-
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index e74310c..21d8bd7 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -64,8 +64,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
-            
-            m_scene = SceneHelpers.SetupScene();
+
+            SceneHelpers sceneHelpers = new SceneHelpers();
+            m_scene = sceneHelpers.SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, m_iam);
             
             // Create user
@@ -76,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             
             AgentCircuitData acd = new AgentCircuitData();
             acd.AgentID = m_userId;
-            m_tc = new TestClient(acd, m_scene);            
+            m_tc = new TestClient(acd, m_scene);
         }
         
         [Test]
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 9255791..e91e8b9 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
         private TimeSpan m_QueueTimeout = new TimeSpan(2, 0, 0); // 2 hours without llGetNextEmail drops the queue
         private string m_InterObjectHostname = "lsl.opensim.local";
 
+        private int m_MaxEmailSize = 4096;  // largest email allowed by default, as per lsl docs.
+
         // Scenes by Region Handle
         private Dictionary<ulong, Scene> m_Scenes =
             new Dictionary<ulong, Scene>();
@@ -127,6 +129,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                 SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT);
                 SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN);
                 SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD);
+                m_MaxEmailSize = SMTPConfig.GetInt("email_max_size", m_MaxEmailSize); 
             }
             catch (Exception e)
             {
@@ -176,18 +179,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
             get { return true; }
         }
 
-        /// <summary>
-        /// Delay function using thread in seconds
-        /// </summary>
-        /// <param name="seconds"></param>
-        private void DelayInSeconds(int delay)
-        {
-            delay = (int)((float)delay * 1000);
-            if (delay == 0)
-                return;
-            System.Threading.Thread.Sleep(delay);
-        }
-
         private bool IsLocal(UUID objectID)
         {
             string unused;
@@ -267,10 +258,9 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                 m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address);
                 return;
             }
-            //FIXME:Check if subject + body = 4096 Byte
-            if ((subject.Length + body.Length) > 1024)
+            if ((subject.Length + body.Length) > m_MaxEmailSize)
             {
-                m_log.Error("[EMAIL] subject + body > 1024 Byte");
+                m_log.Error("[EMAIL] subject + body larger than limit of " + m_MaxEmailSize + " bytes");
                 return;
             }
 
@@ -345,10 +335,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                     // TODO FIX
                 }
             }
-
-            //DONE: Message as Second Life style
-            //20 second delay - AntiSpam System - for now only 10 seconds
-            DelayInSeconds(10);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index f4cf6b4..199dd11 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -147,6 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public void Close()
         {
         }
+
         public UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID)
         {
             UUID urlcode = UUID.Random();
@@ -176,6 +177,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     uri,
                     new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
 
+                m_log.DebugFormat(
+                    "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
+                    uri, itemID, host.Name, host.LocalId);
+
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
 
@@ -218,6 +223,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     uri,
                     new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
 
+                m_log.DebugFormat(
+                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
+                    uri, itemID, host.Name, host.LocalId);
+
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
 
@@ -241,6 +250,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         m_RequestMap.Remove(req);
                 }
                         
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
+//                    url, data.itemID, data.hostID);
+
                 RemoveUrl(data);
                 m_UrlMap.Remove(url);
             }
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 176c86d..8358bc0 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -308,56 +308,56 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
+        public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
         {
-            error = null;
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // Send message to avatar
+                // ignore if a child agent this is restricted to inside one region
+                if (sp.IsChildAgent)
+                    return;
+
+                // Send message to the avatar.
+                // Channel zero only goes to the avatar
+                // non zero channel messages only go to the attachments
                 if (channel == 0)
                 {
-                    m_scene.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false);
-                }
-
-                List<SceneObjectGroup> attachments = sp.GetAttachments();
-
-                if (attachments.Count == 0)
-                    return true;
-
-                // Get uuid of attachments
-                List<UUID> targets = new List<UUID>();
-                foreach (SceneObjectGroup sog in attachments)
+                    m_scene.SimChatToAgent(target, Utils.StringToBytes(msg), pos, name, id, false);
+               }
+                else
                 {
-                    if (!sog.IsDeleted)
-                        targets.Add(sog.UUID);
-                }
+                    List<SceneObjectGroup> attachments = sp.GetAttachments();
+                    if (attachments.Count == 0)
+                        return;
 
-                // Need to check each attachment
-                foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
-                {
-                    if (li.GetHostID().Equals(id))
-                        continue;
+                    // Get uuid of attachments
+                    List<UUID> targets = new List<UUID>();
+                    foreach (SceneObjectGroup sog in attachments)
+                    {
+                        if (!sog.IsDeleted)
+                            targets.Add(sog.UUID);
+                    }
 
-                    if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
-                        continue;
+                    // Need to check each attachment
+                    foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
+                    {
+                        if (li.GetHostID().Equals(id))
+                            continue;
 
-                    if (targets.Contains(li.GetHostID()))
-                        QueueMessage(new ListenerInfo(li, name, id, msg));
-                }
+                        if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                            continue;
 
-                return true;
-            }
+                        if (targets.Contains(li.GetHostID()))
+                            QueueMessage(new ListenerInfo(li, name, id, msg));
+                    }
+                }
 
-            // Need to toss an error here
-            if (channel == 0)
-            {
-                error = "Cannot use llRegionSayTo to message objects on channel 0";
-                return false;
+                return;
             }
 
+            // No avatar found so look for an object
             foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
             {
                 // Dont process if this message is from yourself!
@@ -375,7 +375,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 }
             }
 
-            return true;
+            return;
         }
 
         protected void QueueMessage(ListenerInfo li)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
index f0d21e6..4470799 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private IUserManagement m_UserManagement;
-        private IGridService m_GridService;
+//        private IGridService m_GridService;
 
         private Scene m_Scene;
         AccessFlags m_accessValue = AccessFlags.None;
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         {
             m_Scene = scene;
             m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
-            m_GridService = scene.GridService;
+//            m_GridService = scene.GridService;
 
             if (config != null)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 3b862da..6cd077a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -149,9 +149,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             lock (m_scenes)
                 m_scenes[scene.RegionInfo.RegionID] = scene;
 
-            scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
+            scene.EventManager.OnLoginsEnabled += OnLoginsEnabled; 
         }
 
+
         ///<summary>
         ///
         ///</summary>
@@ -166,9 +167,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
 
         #endregion ISharedRegionModule
 
-        void EventManager_OnPrimsLoaded(Scene s)
+        void OnLoginsEnabled(string regionName)
         {
-            UploadMapTile(s);
+            Scene scene = null;
+            foreach (Scene s in m_scenes.Values)
+                if (s.RegionInfo.RegionName == regionName)
+                {
+                    scene = s;
+                    break;
+                }
+            if (scene != null)
+                UploadMapTile(scene);
         }
 
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 6e75692..de089f3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             {
                 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
                 {
-                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName);
+//                    m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName);
                     return s.NewUserConnection(aCircuit, teleportFlags, out reason);
                 }
             }
@@ -209,9 +209,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             {
                 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
                 {
-                    m_log.DebugFormat(
-                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
-                        s.RegionInfo.RegionName, destination.RegionHandle);
+//                    m_log.DebugFormat(
+//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
+//                        s.RegionInfo.RegionName, destination.RegionHandle);
 
                     s.IncomingChildAgentDataUpdate(cAgentData);
                     return true;
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             {
                 if (s.RegionInfo.RegionID == origin)
                 {
-                    m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
+//                    m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
                     AgentTransferModule.AgentArrivedAtDestination(id);
                     return true;
 //                    return s.IncomingReleaseAgent(id);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 38db239..0c4069f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -245,6 +245,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
+            UUID oldTelehubUUID = m_scene.RegionInfo.RegionSettings.TelehubObject;
+
             IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
             int sceneObjectsLoadedCount = 0;
 
@@ -266,11 +268,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
+                bool isTelehub = (sceneObject.UUID == oldTelehubUUID);
+
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
                 // on the same region server and multiple examples a single object archive to be imported
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
 
+                if (isTelehub)
+                {
+                    // Change the Telehub Object to the new UUID
+                    m_scene.RegionInfo.RegionSettings.TelehubObject = sceneObject.UUID;
+                    m_scene.RegionInfo.RegionSettings.Save();
+                    oldTelehubUUID = UUID.Zero;
+                }
+
                 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid
                 // or creator data is present.  Otherwise, use the estate owner instead.
                 foreach (SceneObjectPart part in sceneObject.Parts)
@@ -347,7 +359,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             int ignoredObjects = serialisedSceneObjects.Count - sceneObjectsLoadedCount;
 
             if (ignoredObjects > 0)
-                m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects);            
+                m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects);
+
+            if (oldTelehubUUID != UUID.Zero)
+            {
+                m_log.WarnFormat("Telehub object not found: {0}", oldTelehubUUID);
+                m_scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
+                m_scene.RegionInfo.RegionSettings.ClearSpawnPoints();
+            }
         }
         
         /// <summary>
@@ -523,6 +542,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;
             currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
             currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
+            currentRegionSettings.TelehubObject = loadedRegionSettings.TelehubObject;
+            currentRegionSettings.ClearSpawnPoints();
+            foreach (SpawnPoint sp in loadedRegionSettings.SpawnPoints())
+                currentRegionSettings.AddSpawnPoint(sp);
 
             currentRegionSettings.Save();
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 4d459bf..5679ad5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -40,6 +40,9 @@ using OpenSim.Framework.Serialization;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Ionic.Zlib;
+using GZipStream = Ionic.Zlib.GZipStream;
+using CompressionMode = Ionic.Zlib.CompressionMode;
 
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
@@ -82,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             try
             {
-                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress);
+                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression);
             }
             catch (EntryPointNotFoundException e)
             {
@@ -297,10 +300,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (checkPermissions.Contains("T") && !canTransfer)
                     partPermitted = false;
 
+                // If the user is the Creator of the object then it can always be included in the OAR
+                bool creator = (obj.CreatorID.Guid == user.Guid);
+                if (creator)
+                    partPermitted = true;
+
                 //string name = (objGroup.PrimCount == 1) ? objGroup.Name : string.Format("{0} ({1}/{2})", obj.Name, primNumber, objGroup.PrimCount);
-                //m_log.DebugFormat("[ARCHIVER]: Object permissions: {0}: Base={1:X4}, Owner={2:X4}, Everyone={3:X4}, permissionClass={4}, checkPermissions={5}, canCopy={6}, canTransfer={7}, permitted={8}",
+                //m_log.DebugFormat("[ARCHIVER]: Object permissions: {0}: Base={1:X4}, Owner={2:X4}, Everyone={3:X4}, permissionClass={4}, checkPermissions={5}, canCopy={6}, canTransfer={7}, creator={8}, permitted={9}",
                 //    name, obj.BaseMask, obj.OwnerMask, obj.EveryoneMask,
-                //    permissionClass, checkPermissions, canCopy, canTransfer, permitted);
+                //    permissionClass, checkPermissions, canCopy, canTransfer, creator, partPermitted);
 
                 if (!partPermitted)
                 {
@@ -320,7 +328,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <returns></returns>
         public string CreateControlFile(Dictionary<string, object> options)
         {
-            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 7;
+            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 8;
 //
 //            if (options.ContainsKey("version"))
 //            {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 63f1363..394ca27 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             SerialiserModule serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
         }
         
@@ -102,9 +102,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
             Vector3 groupPosition = new Vector3(10, 20, 30);
             Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
-            Vector3 offsetPosition = new Vector3(5, 10, 15);
+//            Vector3 offsetPosition = new Vector3(5, 10, 15);
 
-            return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
+            return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, Vector3.Zero) { Name = partName };
         }
 
         protected SceneObjectPart CreateSceneObjectPart2()
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                TestScene scene2 = SceneHelpers.SetupScene();
+                TestScene scene2 = new SceneHelpers().SetupScene();
                 SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);
 
                 // Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is
@@ -534,6 +534,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080");
             rs.UseEstateSun = true;
             rs.WaterHeight = 23;
+            rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
+            rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
 
             tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs));
             
@@ -580,6 +582,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(loadedRs.TerrainTexture4, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000080")));
             Assert.That(loadedRs.UseEstateSun, Is.True);
             Assert.That(loadedRs.WaterHeight, Is.EqualTo(23));
+            Assert.AreEqual(UUID.Zero, loadedRs.TelehubObject); // because no object was found with the original UUID
+            Assert.AreEqual(0, loadedRs.SpawnPoints().Count);
         }
         
         /// <summary>
@@ -607,7 +611,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                Scene scene = SceneHelpers.SetupScene();
+                Scene scene = new SceneHelpers().SetupScene();
                 SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
 
                 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 1e743c3..ddc2a07 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -168,12 +168,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionInfoPacketToAll();
         }
 
-        public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture)
+        public void setEstateTerrainBaseTexture(int level, UUID texture)
+        {
+            setEstateTerrainBaseTexture(null, level, texture);
+            sendRegionHandshakeToAll();
+        }
+
+        public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int level, UUID texture)
         {
             if (texture == UUID.Zero)
                 return;
 
-            switch (corner)
+            switch (level)
             {
                 case 0:
                     Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
@@ -193,6 +199,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionInfoPacketToAll();
         }
 
+        public void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue)
+        {
+            setEstateTerrainTextureHeights(null, corner, lowValue, highValue);
+        }
+
         public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue)
         {
             switch (corner)
@@ -987,7 +998,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             RegionHandshakeArgs args = new RegionHandshakeArgs();
 
-            args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManager(remoteClient.AgentId);
+            args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(remoteClient.AgentId);
             if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId)
                 args.isEstateManager = true;
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 02ac091..2fa0b3f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1392,21 +1392,26 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("RemoteParcelRequest",
-                                 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                           {
-                                                               return RemoteParcelRequest(request, path, param, agentID, caps);
-                                                           }));
+            caps.RegisterHandler(
+                "RemoteParcelRequest",
+                new RestStreamHandler(
+                    "POST",
+                    capsBase + remoteParcelRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => RemoteParcelRequest(request, path, param, agentID, caps),
+                    "RemoteParcelRequest",
+                    agentID.ToString()));
+
             UUID parcelCapID = UUID.Random();
-            caps.RegisterHandler("ParcelPropertiesUpdate",
-                                 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                           {
-                                                               return ProcessPropertiesUpdate(request, path, param, agentID, caps);
-                                                           }));
+            caps.RegisterHandler(
+                "ParcelPropertiesUpdate",
+                new RestStreamHandler(
+                    "POST",
+                    "/CAPS/" + parcelCapID,
+                        (request, path, param, httpRequest, httpResponse)
+                            => ProcessPropertiesUpdate(request, path, param, agentID, caps),
+                    "ParcelPropertiesUpdate",
+                    agentID.ToString()));
         }
         private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
         {
@@ -1771,7 +1776,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
 
-            targetAvatar.TeleportWithMomentum(pos);
+            targetAvatar.TeleportWithMomentum(pos, null);
             targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
             parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
             
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 509c4d7..16792b3 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -447,7 +447,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     bool isMember;
                     if (m_groupMemberCache.TryGetValue(avatar, out isMember))
+                    {
+                        m_groupMemberCache.Update(avatar, isMember, m_groupMemberCacheTimeout);
                         return isMember;
+                    }
 
                     IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
                     if (groupsModule == null)
@@ -484,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
 
-            if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
+            if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar))
                 return false;
 
             if (avatar == LandData.OwnerID)
@@ -514,7 +517,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
 
-            if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
+            if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar))
                 return false;
 
             if (avatar == LandData.OwnerID)
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 5122734..102b4d7 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -126,7 +126,6 @@ namespace OpenSim.Region.CoreModules.World.Land
 //                    m_log.DebugFormat(
 //                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", 
 //                        obj.Name, m_Scene.RegionInfo.RegionName);
-                    
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index e553ffa..b5ee4d2 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             m_pcm = new PrimCountModule();
             LandManagementModule lmm = new LandManagementModule();
-            m_scene = SceneHelpers.SetupScene();            
+            m_scene = new SceneHelpers().SetupScene();            
             SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);             
                         
             int xParcelDivider = (int)Constants.RegionSize - 1;
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index f86c790..aa306c7 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             int tc = 0;
             double[,] hm = whichScene.Heightmap.GetDoubles();
             tc = Environment.TickCount;
-            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
             EntityBase[] objs = whichScene.GetEntities();
             Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
             //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>();
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 g.Dispose();
             } // lock entities objs
 
-            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
             return mapbmp;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
index eb1a27f..992bff3 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void TerrainToBitmap(Bitmap mapbmp)
         {
             int tc = Environment.TickCount;
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Terrain");
 
             double[,] hm = m_scene.Heightmap.GetDoubles();
             bool ShadowDebugContinue = true;
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     }
                 }
             }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 1d2141e..d13c2ef 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void TerrainToBitmap(Bitmap mapbmp)
         {
             int tc = Environment.TickCount;
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Terrain");
 
             // These textures should be in the AssetCache anyway, as every client conneting to this
             // region needs them. Except on start, when the map is recreated (before anyone connected),
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     }
                 }
             }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
+            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 5239f50..601e81e 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -145,7 +145,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
-                    "ObjectMedia", new RestStreamHandler("POST", omCapUrl, HandleObjectMediaMessage));
+                    "ObjectMedia",
+                    new RestStreamHandler(
+                        "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString()));
             }
             
             string omuCapUrl = "/CAPS/" + UUID.Random();
@@ -157,7 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
-                    "ObjectMediaNavigate", new RestStreamHandler("POST", omuCapUrl, HandleObjectMediaNavigateMessage));
+                    "ObjectMediaNavigate",
+                    new RestStreamHandler(
+                        "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString()));
             }
         }
         
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index 4326606..0545250 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
         public void SetUp()
         {
             m_module = new MoapModule();
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, m_module);            
         }        
         
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index f5a5c92..5e928f3 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -78,45 +78,49 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_scene = scene;
             m_console = MainConsole.Instance;
 
-            m_console.Commands.AddCommand("Regions", false, "delete object owner",
+            m_console.Commands.AddCommand("Objects", false, "delete object owner",
                                           "delete object owner <UUID>",
                                           "Delete a scene object by owner", HandleDeleteObject);
-            m_console.Commands.AddCommand("Regions", false, "delete object creator",
+
+            m_console.Commands.AddCommand("Objects", false, "delete object creator",
                                           "delete object creator <UUID>",
                                           "Delete a scene object by creator", HandleDeleteObject);
-            m_console.Commands.AddCommand("Regions", false, "delete object uuid",
+
+            m_console.Commands.AddCommand("Objects", false, "delete object uuid",
                                           "delete object uuid <UUID>",
                                           "Delete a scene object by uuid", HandleDeleteObject);
-            m_console.Commands.AddCommand("Regions", false, "delete object name",
+
+            m_console.Commands.AddCommand("Objects", false, "delete object name",
                                           "delete object name <name>",
                                           "Delete a scene object by name", HandleDeleteObject);
-            m_console.Commands.AddCommand("Regions", false, "delete object outside",
+
+            m_console.Commands.AddCommand("Objects", false, "delete object outside",
                                           "delete object outside",
                                           "Delete all scene objects outside region boundaries", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
-                "Regions",
+                "Objects",
                 false,
                 "show object uuid",
                 "show object uuid <UUID>",
                 "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
 
             m_console.Commands.AddCommand(
-                "Regions",
+                "Objects",
                 false,
                 "show object name",
                 "show object name <name>",
                 "Show details of scene objects with the given name", HandleShowObjectByName);
 
             m_console.Commands.AddCommand(
-                "Regions",
+                "Objects",
                 false,
                 "show part uuid",
                 "show part uuid <UUID>",
                 "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
 
             m_console.Commands.AddCommand(
-                "Regions",
+                "Objects",
                 false,
                 "show part name",
                 "show part name <name>",
@@ -271,6 +275,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             sb.AppendFormat("Description: {0}\n", so.Description);
             sb.AppendFormat("Location:    {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName);
             sb.AppendFormat("Parts:       {0}\n", so.PrimCount);
+            sb.AppendFormat("Flags:       {0}\n", so.RootPart.Flags);
 
             return sb;
         }
@@ -282,7 +287,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             sb.AppendFormat("Location:    {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName);
             sb.AppendFormat("Parent:      {0}",
                 sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID));
-            sb.AppendFormat("Parts:       {0}\n", !sop.IsRoot ? "1" : sop.ParentGroup.PrimCount.ToString());;
+            sb.AppendFormat("Link number: {0}\n", sop.LinkNum);
+            sb.AppendFormat("Flags:       {0}\n", sop.Flags);
 
             return sb;
         }
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 82ccaf8..190f63b 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -166,6 +166,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnDeedParcel += CanDeedParcel;
             m_scene.Permissions.OnDeedObject += CanDeedObject;
             m_scene.Permissions.OnIsGod += IsGod;
+            m_scene.Permissions.OnIsGridGod += IsGridGod;
             m_scene.Permissions.OnIsAdministrator += IsAdministrator;
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
             m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
@@ -466,22 +467,34 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (IsEstateManager(user) && m_RegionManagerIsGod)
                 return true;
 
+            if (IsGridGod(user, null))
+                return true;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Is the given user a God throughout the grid (not just in the current scene)?
+        /// </summary>
+        /// <param name="user">The user</param>
+        /// <param name="scene">Unused, can be null</param>
+        /// <returns></returns>
+        protected bool IsGridGod(UUID user, Scene scene)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+
+            if (user == UUID.Zero) return false;
+
             if (m_allowGridGods)
             {
                 ScenePresence sp = m_scene.GetScenePresence(user);
                 if (sp != null)
-                {
-                    if (sp.UserLevel >= 200)
-                        return true;
-                    return false;
-                }
+                    return (sp.UserLevel >= 200);
 
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
                 if (account != null)
-                {
-                    if (account.UserLevel >= 200)
-                        return true;
-                }
+                    return (account.UserLevel >= 200);
             }
 
             return false;
@@ -503,7 +516,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             if (user == UUID.Zero) return false;
         
-            return m_scene.RegionInfo.EstateSettings.IsEstateManager(user);
+            return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
         }
 
 #endregion
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index d1d2020..7825e3e 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         public void Init()
         {
             m_serialiserModule = new SerialiserModule();
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, m_serialiserModule);
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index da81dc1..d78ade5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -59,28 +59,32 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A terrain channel generated from the image.</returns>
         public virtual ITerrainChannel LoadFile(string filename)
         {
-            return LoadBitmap(new Bitmap(filename));
+            using (Bitmap b = new Bitmap(filename))
+                return LoadBitmap(b);
         }
 
         public virtual ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int w, int h)
         {
-            Bitmap bitmap = new Bitmap(filename);
-            ITerrainChannel retval = new TerrainChannel(true);
-
-            for (int x = 0; x < retval.Width; x++)
+            using (Bitmap bitmap = new Bitmap(filename))
             {
-                for (int y = 0; y < retval.Height; y++)
+                ITerrainChannel retval = new TerrainChannel(true);
+
+                for (int x = 0; x < retval.Width; x++)
                 {
-                    retval[x, y] = bitmap.GetPixel(offsetX * retval.Width + x, (bitmap.Height - (retval.Height * (offsetY + 1))) + retval.Height - y - 1).GetBrightness() * 128;
+                    for (int y = 0; y < retval.Height; y++)
+                    {
+                        retval[x, y] = bitmap.GetPixel(offsetX * retval.Width + x, (bitmap.Height - (retval.Height * (offsetY + 1))) + retval.Height - y - 1).GetBrightness() * 128;
+                    }
                 }
-            }
 
-            return retval;
+                return retval;
+            }
         }
 
         public virtual ITerrainChannel LoadStream(Stream stream)
         {
-            return LoadBitmap(new Bitmap(stream));
+            using (Bitmap b = new Bitmap(stream))
+                return LoadBitmap(b);
         }
 
         protected virtual ITerrainChannel LoadBitmap(Bitmap bitmap)
@@ -134,35 +138,53 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             // "Saving the image to the same file it was constructed from is not allowed and throws an exception."
             string tempName = Path.GetTempFileName();
 
-            Bitmap entireBitmap = null;
+            Bitmap existingBitmap = null;
             Bitmap thisBitmap = null;
-            if (File.Exists(filename))
+            Bitmap newBitmap = null;
+
+            try
             {
-                File.Copy(filename, tempName, true);
-                entireBitmap = new Bitmap(tempName);
-                if (entireBitmap.Width != fileWidth * regionSizeX || entireBitmap.Height != fileHeight * regionSizeY)
+                if (File.Exists(filename))
+                {
+                    File.Copy(filename, tempName, true);
+                    existingBitmap = new Bitmap(tempName);
+                    if (existingBitmap.Width != fileWidth * regionSizeX || existingBitmap.Height != fileHeight * regionSizeY)
+                    {
+                        // old file, let's overwrite it
+                        newBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
+                    }
+                    else
+                    {
+                        newBitmap = existingBitmap;
+                    }
+                }
+                else
                 {
-                    // old file, let's overwrite it
-                    entireBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
+                    newBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
                 }
+    
+                thisBitmap = CreateGrayscaleBitmapFromMap(m_channel);
+    //            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
+                for (int x = 0; x < regionSizeX; x++)
+                    for (int y = 0; y < regionSizeY; y++)
+                        newBitmap.SetPixel(x + offsetX * regionSizeX, y + (fileHeight - 1 - offsetY) * regionSizeY, thisBitmap.GetPixel(x, y));
+    
+                Save(newBitmap, filename);
             }
-            else
+            finally
             {
-                entireBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
-            }
+                if (existingBitmap != null)
+                    existingBitmap.Dispose();
 
-            thisBitmap = CreateGrayscaleBitmapFromMap(m_channel);
-//            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
-            for (int x = 0; x < regionSizeX; x++)
-                for (int y = 0; y < regionSizeY; y++)
-                    entireBitmap.SetPixel(x + offsetX * regionSizeX, y + (fileHeight - 1 - offsetY) * regionSizeY, thisBitmap.GetPixel(x, y));
+                if (thisBitmap != null)
+                    thisBitmap.Dispose();
 
-            Save(entireBitmap, filename);
-            thisBitmap.Dispose();
-            entireBitmap.Dispose();
+                if (newBitmap != null)
+                    newBitmap.Dispose();
 
-            if (File.Exists(tempName))
-                File.Delete(tempName);
+                if (File.Exists(tempName))
+                    File.Delete(tempName);
+            }
         }
 
         protected virtual void Save(Bitmap bmp, string filename)
@@ -226,16 +248,21 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
         protected static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
-
-            int pallete = gradientmapLd.Height;
+            int pallete;
+            Bitmap bmp;
+            Color[] colours;
 
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
-
-            for (int i = 0; i < pallete; i++)
+            using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
             {
-                colours[i] = gradientmapLd.GetPixel(0, i);
+                pallete = gradientmapLd.Height;
+    
+                bmp = new Bitmap(map.Width, map.Height);
+                colours = new Color[pallete];
+    
+                for (int i = 0; i < pallete; i++)
+                {
+                    colours[i] = gradientmapLd.GetPixel(0, i);
+                }
             }
 
             for (int y = 0; y < map.Height; y++)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 699d67a..9cc767a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -99,16 +99,21 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         private static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+            int pallete;
+            Bitmap bmp;
+            Color[] colours;
 
-            int pallete = gradientmapLd.Height;
-
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
-
-            for (int i = 0; i < pallete; i++)
+            using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
             {
-                colours[i] = gradientmapLd.GetPixel(0, i);
+                pallete = gradientmapLd.Height;
+    
+                bmp = new Bitmap(map.Width, map.Height);
+                colours = new Color[pallete];
+    
+                for (int i = 0; i < pallete; i++)
+                {
+                    colours[i] = gradientmapLd.GetPixel(0, i);
+                }
             }
 
             for (int y = 0; y < map.Height; y++)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index e2bd769..5b03ac7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -724,6 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             if (shouldTaint)
             {
+                m_scene.EventManager.TriggerTerrainTainted();
                 m_tainted = true;
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 899e5ea..be6b240 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -190,14 +190,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("MapLayer",
-                                 new RestStreamHandler("POST", capsBase + m_mapLayerPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                           {
-                                                               return MapLayerRequest(request, path, param,
-                                                                                      agentID, caps);
-                                                           }));
+            caps.RegisterHandler(
+                "MapLayer",
+                new RestStreamHandler(
+                    "POST",
+                    capsBase + m_mapLayerPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => MapLayerRequest(request, path, param, agentID, caps),
+                    "MapLayer",
+                    agentID.ToString()));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 2f2b3e6..32e93b4 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -42,13 +42,13 @@ namespace OpenSim.Region.DataSnapshot
 {
     public class DataRequestHandler
     {
-        private Scene m_scene = null;
+//        private Scene m_scene = null;
         private DataSnapshotManager m_externalData = null;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
         {
-            m_scene = scene;
+//            m_scene = scene;
             m_externalData = externalData;
 
             //Register HTTP handler
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 32f4eea..8732ec0 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -174,7 +174,17 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If no inventory item has that name then an empty list is returned.
         /// </returns>
         List<TaskInventoryItem> GetInventoryItems(string name);
-        
+
+        /// <summary>
+        /// Get inventory items by type.
+        /// </summary>
+        /// <param type="name"></param>
+        /// <returns>
+        /// A list of inventory items of that type.
+        /// If no inventory items of that type then an empty list is returned.
+        /// </returns>
+        List<TaskInventoryItem> GetInventoryItems(InventoryType type);
+
         /// <summary>
         /// Get the scene object referenced by an inventory item.
         /// </summary>
@@ -228,6 +238,16 @@ namespace OpenSim.Region.Framework.Interfaces
         bool ContainsScripts();
 
         /// <summary>
+        /// Returns the count of scripts contained
+        /// </summary></returns>
+        int ScriptCount();
+
+        /// <summary>
+        /// Returns the count of running scripts contained
+        /// </summary></returns>
+        int RunningScriptCount();
+
+        /// <summary>
         /// Get the uuids of all items in this inventory
         /// </summary>
         /// <returns></returns>
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 76f1641..9cd27f9 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -39,13 +39,23 @@ namespace OpenSim.Region.Framework.Interfaces
 
     public interface IEntityTransferModule
     {
-        void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
-                                                      Vector3 lookAt, uint teleportFlags);
+        /// <summary>
+        /// Teleport an agent within the same or to a different region.
+        /// </summary>
+        /// <param name='agent'></param>
+        /// <param name='regionHandle'>
+        /// The handle of the destination region.  If it's the same as the region currently
+        /// occupied by the agent then the teleport will be within that region.
+        /// </param>
+        /// <param name='position'></param>
+        /// <param name='lookAt'></param>
+        /// <param name='teleportFlags'></param>
+        void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
 
         bool TeleportHome(UUID id, IClientAPI client);
 
         void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
-            Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq);
+            Vector3 position, Vector3 lookAt, uint teleportFlags);
 
         bool Cross(ScenePresence agent, bool isFlying);
 
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 72e79ed..ca2ad94 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -47,5 +47,8 @@ namespace OpenSim.Region.Framework.Interfaces
         void sendRegionHandshakeToAll();
         void TriggerEstateInfoChange();
         void TriggerRegionInfoChange();
+
+        void setEstateTerrainBaseTexture(int level, UUID texture);
+        void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
new file mode 100644
index 0000000..baac6e8
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Contributors 
+ * 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 OpenSim 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.Reflection;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public delegate void TakeValueCallback(string s);
+
+    public interface IJsonStoreModule
+    {
+        bool CreateStore(string value, out UUID result);
+        bool DestroyStore(UUID storeID);
+        bool TestPath(UUID storeID, string path, bool useJson);
+        bool SetValue(UUID storeID, string path, string value, bool useJson);
+        bool RemoveValue(UUID storeID, string path);
+        bool GetValue(UUID storeID, string path, bool useJson, out string value);
+
+        void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
+        void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
+    }
+}
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index dc3ff89..860483d 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -113,9 +113,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="landAtTarget">
         /// If true and the avatar is flying when it reaches the target, land.
-        /// </param>
+        /// </param> name="running">
+        /// If true, NPC moves with running speed.
         /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns>
-        bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget);
+        /// 
+        bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget, bool running);
 
         /// <summary>
         /// Stop the NPC's current movement.
@@ -135,6 +137,36 @@ namespace OpenSim.Region.Framework.Interfaces
         bool Say(UUID agentID, Scene scene, string text);
 
         /// <summary>
+        /// Get the NPC to say something.
+        /// </summary>
+        /// <param name="agentID">The UUID of the NPC</param>
+        /// <param name="scene"></param>
+        /// <param name="text"></param>
+        /// <param name="channel"></param>
+        /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns>
+        bool Say(UUID agentID, Scene scene, string text, int channel);
+
+        /// <summary>
+        /// Get the NPC to shout something.
+        /// </summary>
+        /// <param name="agentID">The UUID of the NPC</param>
+        /// <param name="scene"></param>
+        /// <param name="text"></param>
+        /// <param name="channel"></param>
+        /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns>
+        bool Shout(UUID agentID, Scene scene, string text, int channel);
+
+        /// <summary>
+        /// Get the NPC to whisper something.
+        /// </summary>
+        /// <param name="agentID">The UUID of the NPC</param>
+        /// <param name="scene"></param>
+        /// <param name="text"></param>
+        /// <param name="channel"></param>
+        /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns>
+        bool Whisper(UUID agentID, Scene scene, string text, int channel);
+
+        /// <summary>
         /// Sit the NPC.
         /// </summary>
         /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index ce66100..143af48 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -71,6 +71,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         bool HasScript(UUID itemID, out bool running);
 
+        /// <summary>
+        /// Returns true if a script is running.
+        /// </summary>
+        /// <param name="itemID">The item ID of the script.</param>
+        bool GetScriptState(UUID itemID);
+
         void SaveAllState();
 
         /// <summary>
@@ -79,6 +85,14 @@ namespace OpenSim.Region.Framework.Interfaces
         void StartProcessing();
 
         /// <summary>
+        /// Get the execution times of all scripts in the given array if they are currently running.
+        /// </summary>
+        /// <returns>
+        /// A float the value is a representative execution time in milliseconds of all scripts in that Array.
+        /// </returns>
+        float GetScriptExecutionTime(List<UUID> itemIDs);
+
+        /// <summary>
         /// Get the execution times of all scripts in each object.
         /// </summary>
         /// <returns>
@@ -87,4 +101,4 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </returns>
         Dictionary<uint, float> GetObjectScriptsExecutionTimes();
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index e8e375e..4e74781 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name='msg'>
         /// Message.
         /// </param>
-        bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error);
+        void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg);
 
         /// <summary>
         /// Are there any listen events ready to be dispatched?
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index e577958..9ddac19 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -294,6 +294,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     return "FALLDOWN";
                 }
 
+                // Check if the user has stopped walking just now
+                if (CurrentMovementAnimation == "WALK" && (move == Vector3.Zero))
+                    return "STAND";
+
                 return CurrentMovementAnimation;
             }
 
@@ -418,13 +422,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         public void UpdateMovementAnimations()
         {
-            CurrentMovementAnimation = DetermineMovementAnimation();
+            lock (m_animations)
+            {
+                CurrentMovementAnimation = DetermineMovementAnimation();
 
-//            m_log.DebugFormat(
-//                "[SCENE PRESENCE ANIMATOR]: Determined animation {0} for {1} in UpdateMovementAnimations()",
-//                CurrentMovementAnimation, m_scenePresence.Name);
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE ANIMATOR]: Determined animation {0} for {1} in UpdateMovementAnimations()",
+//                    CurrentMovementAnimation, m_scenePresence.Name);
 
-            TrySetMovementAnimation(CurrentMovementAnimation);
+                TrySetMovementAnimation(CurrentMovementAnimation);
+            }
         }
 
         public UUID[] GetAnimationArray()
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index f678d07..834464b 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
         {
-            m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop");
+//            m_log.Debug("[ASYNC DELETER]: Starting send to inventory loop");
 
             // We must set appearance parameters in the en_US culture in order to avoid issues where values are saved
             // in a culture where decimal points are commas and then reloaded in a culture which just treats them as
@@ -147,9 +147,9 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         x = m_inventoryDeletes.Dequeue();
 
-                        m_log.DebugFormat(
-                            "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.",
-                            left, x.action, x.objectGroups.Count);
+//                        m_log.DebugFormat(
+//                            "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.",
+//                            left, x.action, x.objectGroups.Count);
                         
                         try
                         {
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes
                     e.StackTrace);
             }
 
-            m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue.");
+//            m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue.");
             
             return false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 2365cfe..7688cf8 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -53,6 +53,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public event ClientMovement OnClientMovement;
 
+        public delegate void OnTerrainTaintedDelegate();
+
+        public event OnTerrainTaintedDelegate OnTerrainTainted;
+
         public delegate void OnTerrainTickDelegate();
 
         public delegate void OnTerrainUpdateDelegate();
@@ -484,6 +488,9 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void SceneObjectPartUpdated(SceneObjectPart sop);
         public event SceneObjectPartUpdated OnSceneObjectPartUpdated;
 
+        public delegate void ScenePresenceUpdated(ScenePresence sp);
+        public event ScenePresenceUpdated OnScenePresenceUpdated;
+
         public delegate void RegionUp(GridRegion region);
         public event RegionUp OnRegionUp;
 
@@ -935,6 +942,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void TriggerTerrainTainted()
+        {
+            OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted;
+            if (handlerTerrainTainted != null)
+            {
+                foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList())
+                {
+                    try
+                    {
+                        d();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerTerrainTainted failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
         public void TriggerParcelPrimCountAdd(SceneObjectGroup obj)
         {
             OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = OnParcelPrimCountAdd;
@@ -2367,6 +2395,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void TriggerScenePresenceUpdated(ScenePresence sp)
+        {
+            ScenePresenceUpdated handler = OnScenePresenceUpdated;
+            if (handler != null)
+            {
+                foreach (ScenePresenceUpdated d in handler.GetInvocationList())
+                {
+                    try
+                    {
+                        d(sp);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerScenePresenceUpdated failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
         public void TriggerOnParcelPropertiesUpdateRequest(LandUpdateArgs args,
                         int local_id, IClientAPI remote_client)
         {
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 6c5685c..1365831 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -48,16 +48,19 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public class RegionStatsHandler : IStreamedRequestHandler
     {
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private string osRXStatsURI = String.Empty;
         private string osXStatsURI = String.Empty;
         //private string osSecret = String.Empty;
         private OpenSim.Framework.RegionInfo regionInfo;
         public string localZone = TimeZone.CurrentTimeZone.StandardName;
         public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
-        
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info)
+        public string Name { get { return "RegionStats"; } }
+        public string Description { get { return "Region Statistics"; } }
+
+        public RegionStatsHandler(RegionInfo region_info)
         {
             regionInfo = region_info;
             osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 29465c0..942c625 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -300,6 +300,10 @@ namespace OpenSim.Region.Framework.Scenes
             AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId);
             AssetService.Store(asset);
 
+//            m_log.DebugFormat(
+//                "[PRIM INVENTORY]: Stored asset {0} when updating item {1} in prim {2} for {3}",
+//                asset.ID, item.Name, part.Name, remoteClient.Name);
+
             if (isScriptRunning)
             {
                 part.Inventory.RemoveScriptInstance(item.ItemID, false);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3ef1e29..cf68ff4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,8 +38,9 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public partial class Scene
     {
+
         protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
-                               UUID fromID, bool fromAgent, bool broadcast)
+                               UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
         {
             OSChatMessage args = new OSChatMessage();
 
@@ -63,14 +64,20 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             args.From = fromName;
-            //args.
+            args.TargetUUID = targetID;
 
             if (broadcast)
                 EventManager.TriggerOnChatBroadcast(this, args);
             else
                 EventManager.TriggerOnChatFromWorld(this, args);
         }
-        
+
+        protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
+                               UUID fromID, bool fromAgent, bool broadcast)
+        {
+            SimChat(message, type, channel, fromPos, fromName, fromID, UUID.Zero, fromAgent, broadcast);
+        }
+
         /// <summary>
         ///
         /// </summary>
@@ -108,6 +115,19 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true);
         }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        /// <param name="targetID"></param>
+        public void SimChatToAgent(UUID targetID, byte[] message, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent)
+        {
+            SimChat(message, ChatTypeEnum.Say, 0, fromPos, fromName, fromID, targetID, fromAgent, false);
+        }
 
         /// <summary>
         /// Invoked when the client requests a prim.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index e1fedf4..535d87a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene);
     public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand);
     public delegate bool IsGodHandler(UUID user, Scene requestFromScene);
+    public delegate bool IsGridGodHandler(UUID user, Scene requestFromScene);
     public delegate bool IsAdministratorHandler(UUID user);
     public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene);
     public delegate bool EditParcelPropertiesHandler(UUID user, ILandObject parcel, GroupPowers p, Scene scene);
@@ -134,6 +135,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event RunConsoleCommandHandler OnRunConsoleCommand;
         public event IssueEstateCommandHandler OnIssueEstateCommand;
         public event IsGodHandler OnIsGod;
+        public event IsGridGodHandler OnIsGridGod;
         public event IsAdministratorHandler OnIsAdministrator;
 //        public event EditParcelHandler OnEditParcel;
         public event EditParcelPropertiesHandler OnEditParcelProperties;
@@ -728,6 +730,21 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        public bool IsGridGod(UUID user)
+        {
+            IsGridGodHandler handler = OnIsGridGod;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (IsGridGodHandler h in list)
+                {
+                    if (h(user, m_scene) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+
         public bool IsAdministrator(UUID user)
         {
             IsAdministratorHandler handler = OnIsAdministrator;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a9a4cda..3e11db3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -103,6 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool m_trustBinaries;
         public bool m_allowScriptCrossings;
         public bool m_useFlySlow;
+        public bool m_useTrashOnDelete = true;
 
         /// <summary>
         /// Temporarily setting to trigger appearance resends at 60 second intervals.
@@ -458,6 +459,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_simulationService == null)
                     m_simulationService = RequestModuleInterface<ISimulationService>();
+
                 return m_simulationService;
             }
         }
@@ -589,6 +591,15 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.Entities; }
         }
 
+        // can be closest/random/sequence
+        private string m_SpawnPointRouting = "closest";
+        // used in sequence see: SpawnPoint()
+        private int m_SpawnPoint;
+        public string SpawnPointRouting
+        {
+            get { return m_SpawnPointRouting; }
+        }
+
         #endregion Properties
 
         #region Constructors
@@ -606,7 +617,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             Random random = new Random();
 
-            m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4);
+            m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4);
             m_moduleLoader = moduleLoader;
             m_authenticateHandler = authen;
             m_sceneGridService = sceneGridService;
@@ -726,6 +737,8 @@ namespace OpenSim.Region.Framework.Scenes
                         m_maxPhys = RegionInfo.PhysPrimMax;
                     }
 
+                    m_SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
+
                     // Here, if clamping is requested in either global or
                     // local config, it will be used
                     //
@@ -735,6 +748,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_clampPrimSize = true;
                     }
 
+                    m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete);
                     m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
                     m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
                     m_dontPersistBefore =
@@ -833,13 +847,11 @@ namespace OpenSim.Region.Framework.Scenes
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
         }
 
-        /// <summary>
-        /// Mock constructor for scene group persistency unit tests.
-        /// SceneObjectGroup RegionId property is delegated to Scene.
-        /// </summary>
-        /// <param name="regInfo"></param>
         public Scene(RegionInfo regInfo)
         {
+            PhysicalPrims = true;
+            CollidablePrims = true;
+
             BordersLocked = true;
             Border northBorder = new Border();
             northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize);  //<---
@@ -866,8 +878,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_eventManager = new EventManager();
 
             m_permissions = new ScenePermissions(this);
-
-//            m_lastUpdate = Util.EnvironmentTickCount();
         }
 
         #endregion
@@ -1404,6 +1414,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 try
                 {
+                    // Apply taints in terrain module to terrain in physics scene
+                    if (Frame % m_update_terrain == 0)
+                    {
+                        terMS = Util.EnvironmentTickCount();
+                        UpdateTerrain();
+                        terrainMS = Util.EnvironmentTickCountSubtract(terMS);
+                    }
+
                     tmpPhysicsMS2 = Util.EnvironmentTickCount();
                     if ((Frame % m_update_physics == 0) && m_physics_enabled)
                         m_sceneGraph.UpdatePreparePhysics();
@@ -1468,13 +1486,6 @@ namespace OpenSim.Region.Framework.Scenes
                         backupMS = Util.EnvironmentTickCountSubtract(backMS);
                     }
     
-                    if (Frame % m_update_terrain == 0)
-                    {
-                        terMS = Util.EnvironmentTickCount();
-                        UpdateTerrain();
-                        terrainMS = Util.EnvironmentTickCountSubtract(terMS);
-                    }
-    
                     //if (Frame % m_update_land == 0)
                     //{
                     //    int ldMS = Util.EnvironmentTickCount();
@@ -2684,10 +2695,10 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     SceneObjectGroup grp = sceneObject;
 
-                    m_log.DebugFormat(
-                        "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.FromItemID, grp.UUID);
-                    m_log.DebugFormat(
-                        "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
+//                    m_log.DebugFormat(
+//                        "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}", grp.FromItemID, grp.UUID);
+//                    m_log.DebugFormat(
+//                        "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
 
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                     
@@ -3382,8 +3393,8 @@ namespace OpenSim.Region.Framework.Scenes
                 try
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Removing {0} agent {1} from region {2}",
-                        (isChildAgent ? "child" : "root"), agentID, RegionInfo.RegionName);
+                        "[SCENE]: Removing {0} agent {1} {2} from region {3}",
+                        (isChildAgent ? "child" : "root"), avatar.Name, agentID, RegionInfo.RegionName);
 
                     m_sceneGraph.removeUserCount(!isChildAgent);
 
@@ -3554,7 +3565,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
         {
             bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
-                             (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
+                (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
             bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0);
             bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0);
 
@@ -3570,8 +3581,17 @@ namespace OpenSim.Region.Framework.Scenes
             // Don't disable this log message - it's too helpful
             m_log.DebugFormat(
                 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
-                RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname,
-                agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, ((TPFlags)teleportFlags).ToString(), agent.startpos);
+                RegionInfo.RegionName,
+                (agent.child ? "child" : "root"),
+                agent.firstname,
+                agent.lastname,
+                agent.AgentID,
+                agent.circuitcode,
+                agent.IPAddress,
+                agent.Viewer,
+                ((TPFlags)teleportFlags).ToString(),
+                agent.startpos
+            );
 
             if (LoginsDisabled)
             {
@@ -3586,7 +3606,11 @@ namespace OpenSim.Region.Framework.Scenes
                 // We have a zombie from a crashed session. 
                 // Or the same user is trying to be root twice here, won't work.
                 // Kill it.
-                m_log.DebugFormat("[SCENE]: Zombie scene presence detected for {0} in {1}", agent.AgentID, RegionInfo.RegionName);
+                m_log.DebugFormat(
+                    "[SCENE]: Zombie scene presence detected for {0} in {1}",
+                    agent.AgentID,
+                    RegionInfo.RegionName
+                );
                 sp.ControllingClient.Close();
                 sp = null;
             }
@@ -3613,8 +3637,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (!VerifyUserPresence(agent, out reason))
                             return false;
-                    }
-                    catch (Exception e)
+                    } catch (Exception e)
                     {
                         m_log.ErrorFormat(
                             "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
@@ -3649,8 +3672,7 @@ namespace OpenSim.Region.Framework.Scenes
                     CapsModule.SetAgentCapsSeeds(agent);
                     CapsModule.CreateCaps(agent.AgentID);
                 }
-            }
-            else
+            } else
             {
                 // Let the SP know how we got here. This has a lot of interesting
                 // uses down the line.
@@ -3673,7 +3695,7 @@ namespace OpenSim.Region.Framework.Scenes
             agent.teleportFlags = teleportFlags;
             m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
 
-            if (vialogin) 
+            if (vialogin)
             {
 //                CleanDroppedAttachments();
 
@@ -3714,8 +3736,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 agent.startpos.Z = 720;
                         }
                     }
-                }
-                else
+                } else
                 {
                     if (agent.startpos.X > EastBorders[0].BorderLine.Z)
                     {
@@ -3741,10 +3762,19 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject);
                     // Can have multiple SpawnPoints
                     List<SpawnPoint> spawnpoints = RegionInfo.RegionSettings.SpawnPoints();
-                    if ( spawnpoints.Count  > 1)
+                    if (spawnpoints.Count > 1)
                     {
-                        // We have multiple SpawnPoints, Route the agent to a random one
-                        agent.startpos =  spawnpoints[Util.RandomClass.Next(spawnpoints.Count)].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                        // We have multiple SpawnPoints, Route the agent to a random or sequential one
+                        if (SpawnPointRouting == "random")
+                            agent.startpos = spawnpoints[Util.RandomClass.Next(spawnpoints.Count) - 1].GetLocation(
+                                telehub.AbsolutePosition,
+                                telehub.GroupRotation
+                            );
+                        else
+                            agent.startpos = spawnpoints[SpawnPoint()].GetLocation(
+                                telehub.AbsolutePosition,
+                                telehub.GroupRotation
+                            );
                     }
                     else
                     {
@@ -3981,41 +4011,41 @@ namespace OpenSim.Region.Framework.Scenes
             return m_authenticateHandler.TryChangeCiruitCode(oldcc, newcc);
         }
 
-        /// <summary>
-        /// The Grid has requested that we log-off a user.  Log them off.
-        /// </summary>
-        /// <param name="AvatarID">Unique ID of the avatar to log-off</param>
-        /// <param name="RegionSecret">SecureSessionID of the user, or the RegionSecret text when logging on to the grid</param>
-        /// <param name="message">message to display to the user.  Reason for being logged off</param>
-        public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message)
-        {
-            ScenePresence loggingOffUser = GetScenePresence(AvatarID);
-            if (loggingOffUser != null)
-            {
-                UUID localRegionSecret = UUID.Zero;
-                bool parsedsecret = UUID.TryParse(m_regInfo.regionSecret, out localRegionSecret);
-
-                // Region Secret is used here in case a new sessionid overwrites an old one on the user server.
-                // Will update the user server in a few revisions to use it.
-
-                if (RegionSecret == loggingOffUser.ControllingClient.SecureSessionId || (parsedsecret && RegionSecret == localRegionSecret))
-                {
-                    m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, loggingOffUser.KnownRegionHandles);
-                    loggingOffUser.ControllingClient.Kick(message);
-                    // Give them a second to receive the message!
-                    Thread.Sleep(1000);
-                    loggingOffUser.ControllingClient.Close();
-                }
-                else
-                {
-                    m_log.Info("[USERLOGOFF]: System sending the LogOff user message failed to sucessfully authenticate");
-                }
-            }
-            else
-            {
-                m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here.  The user might already have been logged out", AvatarID.ToString());
-            }
-        }
+//        /// <summary>
+//        /// The Grid has requested that we log-off a user.  Log them off.
+//        /// </summary>
+//        /// <param name="AvatarID">Unique ID of the avatar to log-off</param>
+//        /// <param name="RegionSecret">SecureSessionID of the user, or the RegionSecret text when logging on to the grid</param>
+//        /// <param name="message">message to display to the user.  Reason for being logged off</param>
+//        public void HandleLogOffUserFromGrid(UUID AvatarID, UUID RegionSecret, string message)
+//        {
+//            ScenePresence loggingOffUser = GetScenePresence(AvatarID);
+//            if (loggingOffUser != null)
+//            {
+//                UUID localRegionSecret = UUID.Zero;
+//                bool parsedsecret = UUID.TryParse(m_regInfo.regionSecret, out localRegionSecret);
+//
+//                // Region Secret is used here in case a new sessionid overwrites an old one on the user server.
+//                // Will update the user server in a few revisions to use it.
+//
+//                if (RegionSecret == loggingOffUser.ControllingClient.SecureSessionId || (parsedsecret && RegionSecret == localRegionSecret))
+//                {
+//                    m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, loggingOffUser.KnownRegionHandles);
+//                    loggingOffUser.ControllingClient.Kick(message);
+//                    // Give them a second to receive the message!
+//                    Thread.Sleep(1000);
+//                    loggingOffUser.ControllingClient.Close();
+//                }
+//                else
+//                {
+//                    m_log.Info("[USERLOGOFF]: System sending the LogOff user message failed to sucessfully authenticate");
+//                }
+//            }
+//            else
+//            {
+//                m_log.InfoFormat("[USERLOGOFF]: Got a logoff request for {0} but the user isn't here.  The user might already have been logged out", AvatarID.ToString());
+//            }
+//        }
 
         /// <summary>
         /// Triggered when an agent crosses into this sim.  Also happens on initial login.
@@ -4071,7 +4101,10 @@ namespace OpenSim.Region.Framework.Scenes
             ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
             if (nearestParcel == null)
             {
-                m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: no allowed parcel", cAgentData.AgentID);
+                m_log.DebugFormat(
+                    "[SCENE]: Denying root agent entry to {0} in {1}: no allowed parcel",
+                    cAgentData.AgentID, RegionInfo.RegionName);
+
                 return false;
             }
 
@@ -5637,5 +5670,19 @@ Environment.Exit(1);
                 }
             }
         }
+
+        // manage and select spawn points in sequence
+        public int SpawnPoint()
+        {
+            int spawnpoints = RegionInfo.RegionSettings.SpawnPoints().Count;
+
+            if (spawnpoints == 0)
+                return 0;
+
+            m_SpawnPoint++;
+            if (m_SpawnPoint > spawnpoints)
+                m_SpawnPoint = 1;
+            return m_SpawnPoint - 1;
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index b806d91..77e808e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -156,7 +156,9 @@ namespace OpenSim.Region.Framework.Scenes
                         // that the region position is cached or performance will degrade
                         Utils.LongToUInts(regionHandle, out x, out y);
                         GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
-//                        bool v = true;
+                        if (dest == null)
+                            continue;
+
                         if (!simulatorList.Contains(dest.ServerURI))
                         {
                             // we havent seen this simulator before, add it to the list
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0d178c3..00f76e0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -101,6 +101,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>();        
 
+        /// <summary>
+        /// Lock to prevent object group update, linking, delinking and duplication operations from running concurrently.
+        /// </summary>
+        /// <remarks>
+        /// These operations rely on the parts composition of the object.  If allowed to run concurrently then race
+        /// conditions can occur.
+        /// </remarks>
         private Object m_updateLock = new Object();
 
         #endregion
@@ -2064,12 +2071,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="AgentID"></param>
         /// <param name="GroupID"></param>
         /// <param name="rot"></param>
+        /// <returns>null if duplication fails, otherwise the duplicated object</returns>
+        /// <summary>
         public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
         {
 //            m_log.DebugFormat(
 //                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", 
 //                originalPrimID, offset, AgentID);
-            
+
             SceneObjectGroup original = GetGroupByPrim(originalPrimID);
             if (original != null)
             {
@@ -2099,25 +2108,25 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
                     Entities.Add(copy);
-                    
+
                     lock (SceneObjectGroupsByFullID)
                         SceneObjectGroupsByFullID[copy.UUID] = copy;
-                    
+
                     SceneObjectPart[] children = copy.Parts;
-                    
+
                     lock (SceneObjectGroupsByFullPartID)
                     {
                         SceneObjectGroupsByFullPartID[copy.UUID] = copy;
                         foreach (SceneObjectPart part in children)
                             SceneObjectGroupsByFullPartID[part.UUID] = copy;
                     }
-        
+
                     lock (SceneObjectGroupsByLocalPartID)
                     {
                         SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
                         foreach (SceneObjectPart part in children)
                             SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
-                    }   
+                    }
                     // PROBABLE END OF FIXME
 
                     // Since we copy from a source group that is in selected
@@ -2149,11 +2158,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
             }
-            
+
             return null;
         }
-        
-        /// <summary>
+
         /// Calculates the distance between two Vector3s
         /// </summary>
         /// <param name="v1"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a6551c1..5328ddc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2670,6 +2670,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Link the prims in a given group to this group
         /// </summary>
+        /// <remarks>
+        /// Do not call this method directly - use Scene.LinkObjects() instead to avoid races between threads.
+        /// FIXME: There are places where scripts call these methods directly without locking.  This is a potential race condition.
+        /// </remarks>
         /// <param name="objectGroup">The group of prims which should be linked to this group</param>
         public void LinkToGroup(SceneObjectGroup objectGroup)
         {
@@ -2751,6 +2755,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 linkPart.LinkNum = linkNum++;
+                linkPart.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
 
                 SceneObjectPart[] ogParts = objectGroup.Parts;
                 Array.Sort(ogParts, delegate(SceneObjectPart a, SceneObjectPart b)
@@ -2802,6 +2807,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Delink the given prim from this group.  The delinked prim is established as
         /// an independent SceneObjectGroup.
         /// </summary>
+        /// <remarks>
+        /// FIXME: This method should not be called directly since it bypasses update locking, allowing a potential race
+        /// condition.  But currently there is no
+        /// alternative method that does take a lonk to delink a single prim.
+        /// </remarks>
         /// <param name="partID"></param>
         /// <returns>The object group of the newly delinked prim.  Null if part could not be found</returns>
         public SceneObjectGroup DelinkFromGroup(uint partID)
@@ -2813,6 +2823,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Delink the given prim from this group.  The delinked prim is established as
         /// an independent SceneObjectGroup.
         /// </summary>
+        /// <remarks>
+        /// FIXME: This method should not be called directly since it bypasses update locking, allowing a potential race
+        /// condition.  But currently there is no
+        /// alternative method that does take a lonk to delink a single prim.
+        /// </remarks>
         /// <param name="partID"></param>
         /// <param name="sendEvents"></param>
         /// <returns>The object group of the newly delinked prim.  Null if part could not be found</returns>
@@ -2838,6 +2853,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Delink the given prim from this group.  The delinked prim is established as
         /// an independent SceneObjectGroup.
         /// </summary>
+        /// <remarks>
+        /// FIXME: This method should not be called directly since it bypasses update locking, allowing a potential race
+        /// condition.  But currently there is no
+        /// alternative method that does take a lonk to delink a single prim.
+        /// </remarks>
         /// <param name="partID"></param>
         /// <param name="sendEvents"></param>
         /// <returns>The object group of the newly delinked prim.</returns>
@@ -2971,6 +2991,8 @@ namespace OpenSim.Region.Framework.Scenes
             oldRot = part.RotationOffset;
             Quaternion newRot = Quaternion.Conjugate(parentRot) * worldRot;
             part.RotationOffset = newRot;
+
+            part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
         }
 
         /// <summary>
@@ -3482,7 +3504,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             //we need to do a terse update even if the move wasn't allowed
             // so that the position is reset in the client (the object snaps back)
-            ScheduleGroupForTerseUpdate();
+            RootPart.ScheduleTerseUpdate();
         }
 
         /// <summary>
@@ -4182,7 +4204,72 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < parts.Length; i++)
                 parts[i].TriggerScriptChangedEvent(val);
         }
-        
+
+        /// <summary>
+        /// Returns a count of the number of scripts in this groups parts.
+        /// </summary>
+        public int ScriptCount()
+        {
+            int count = 0;
+            SceneObjectPart[] parts = m_parts.GetArray();
+            for (int i = 0; i < parts.Length; i++)
+                count += parts[i].Inventory.ScriptCount();
+
+            return count;
+        }
+
+        /// <summary>
+        /// A float the value is a representative execution time in milliseconds of all scripts in the link set.
+        /// </summary>
+        public float ScriptExecutionTime()
+        {
+            IScriptModule[] engines = Scene.RequestModuleInterfaces<IScriptModule>();
+
+            if (engines.Length == 0) // No engine at all
+                return 0.0f;
+
+            float time = 0.0f;
+
+            // get all the scripts in all parts
+            SceneObjectPart[] parts = m_parts.GetArray();
+            List<TaskInventoryItem> scripts = new List<TaskInventoryItem>();
+            for (int i = 0; i < parts.Length; i++)
+            {
+                scripts.AddRange(parts[i].Inventory.GetInventoryItems(InventoryType.LSL));
+            }
+            // extract the UUIDs
+            List<UUID> ids = new List<UUID>(scripts.Count);
+            foreach (TaskInventoryItem script in scripts)
+            {
+                if (!ids.Contains(script.ItemID))
+                {
+                    ids.Add(script.ItemID);
+                }
+            }
+            // Offer the list of script UUIDs to each engine found and accumulate the time
+            foreach (IScriptModule e in engines)
+            {
+                if (e != null)
+                {
+                    time += e.GetScriptExecutionTime(ids);
+                }
+            }
+            return time;
+        }
+
+        /// <summary>
+        /// Returns a count of the number of running scripts in this groups parts.
+        /// </summary>
+        public int RunningScriptCount()
+        {
+            int count = 0;
+            SceneObjectPart[] parts = m_parts.GetArray();
+            for (int i = 0; i < parts.Length; i++)
+                count += parts[i].Inventory.RunningScriptCount();
+
+            return count;
+        }
+
         public override string ToString()
         {
             return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8716e20..f62eef3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2115,6 +2115,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="isNew"></param>
         public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
         {
+            if (ParentGroup.Scene == null)
+                return;
+
             if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
                 return;
 
@@ -3528,7 +3531,6 @@ namespace OpenSim.Region.Framework.Scenes
             hasProfileCut = hasDimple; // is it the same thing?
         }
         
-
         public void SetGroup(UUID groupID, IClientAPI client)
         {
             // Scene.AddNewPrims() calls with client == null so can't use this.
@@ -3558,10 +3560,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetPhysicsAxisRotation()
         {
-            if (PhysActor != null)
+            PhysicsActor pa = PhysActor;
+
+            if (pa != null)
             {
-                PhysActor.LockAngularMotion(RotationAxis);
-                ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+                pa.LockAngularMotion(RotationAxis);
+                ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
             }
         }
 
@@ -4278,7 +4282,7 @@ namespace OpenSim.Region.Framework.Scenes
             // For now, we use the NINJA naming scheme for identifying joints.
             // In the future, we can support other joint specification schemes such as a 
             // custom checkbox in the viewer GUI.
-            if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
+            if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
                 string hingeString = "hingejoint";
                 return (Name.Length >= hingeString.Length && Name.Substring(0, hingeString.Length) == hingeString);
@@ -4294,7 +4298,7 @@ namespace OpenSim.Region.Framework.Scenes
             // For now, we use the NINJA naming scheme for identifying joints.
             // In the future, we can support other joint specification schemes such as a 
             // custom checkbox in the viewer GUI.
-            if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
+            if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
                 string ballString = "balljoint";
                 return (Name.Length >= ballString.Length && Name.Substring(0, ballString.Length) == ballString);
@@ -4310,7 +4314,7 @@ namespace OpenSim.Region.Framework.Scenes
             // For now, we use the NINJA naming scheme for identifying joints.
             // In the future, we can support other joint specification schemes such as a 
             // custom checkbox in the viewer GUI.
-            if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
+            if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
                 return IsHingeJoint() || IsBallJoint();
             }
@@ -4431,7 +4435,6 @@ namespace OpenSim.Region.Framework.Scenes
                                                 }
                          */
                     }
-
                     else // it already has a physical representation
                     {
                         DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 959046a..141cf66 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -267,14 +267,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
         {
-            Items.LockItemsForRead(true);
-            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
-            Items.LockItemsForRead(false);
-            foreach (TaskInventoryItem item in items)
-            {
-                if ((int)InventoryType.LSL == item.InvType)
-                    CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
-            }
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
+            foreach (TaskInventoryItem item in scripts)
+                CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
         }
 
         public ArrayList GetScriptErrors(UUID itemID)
@@ -305,17 +300,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
         {
-            Items.LockItemsForRead(true);
-            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
-            Items.LockItemsForRead(false);
-
-            foreach (TaskInventoryItem item in items)
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
+            foreach (TaskInventoryItem item in scripts)
             {
-                if ((int)InventoryType.LSL == item.InvType)
-                {
-                    RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
-                    m_part.RemoveScriptEvents(item.ItemID);
-                }
+                RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
+                m_part.RemoveScriptEvents(item.ItemID);
             }
         }
 
@@ -1281,9 +1270,57 @@ namespace OpenSim.Region.Framework.Scenes
                     return true;
                 }
             }
+
             return false;
         }
 
+        /// <summary>
+        /// Returns the count of scripts in this parts inventory.
+        /// </summary>
+        /// <returns></returns>
+        public int ScriptCount()
+        {
+            int count = 0;
+            Items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_items.Values)
+            {
+                if (item.InvType == (int)InventoryType.LSL)
+                {
+                    count++;
+                }
+            }
+            Items.LockItemsForRead(false);
+            return count;
+        }
+        /// <summary>
+        /// Returns the count of running scripts in this parts inventory.
+        /// </summary>
+        /// <returns></returns>
+        public int RunningScriptCount()
+        {
+            IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
+            if (engines.Length == 0)
+                return 0;
+
+            int count = 0;
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
+
+            foreach (TaskInventoryItem item in scripts)
+            {
+                foreach (IScriptModule engine in engines)
+                {
+                    if (engine != null)
+                    {
+                        if (engine.GetScriptState(item.ItemID))
+                        {
+                            count++;
+                        }
+                    }
+                }
+            }
+            return count;
+        }
+
         public List<UUID> GetInventoryList()
         {
             List<UUID> ret = new List<UUID>();
@@ -1298,22 +1335,24 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
-                ret = new List<TaskInventoryItem>(m_items.Values);
+            Items.LockItemsForRead(true);
+            ret = new List<TaskInventoryItem>(m_items.Values);
+            Items.LockItemsForRead(false);
 
             return ret;
         }
 
-        public List<TaskInventoryItem> GetInventoryScripts()
+        public List<TaskInventoryItem> GetInventoryItems(InventoryType type)
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
-            {
-                foreach (TaskInventoryItem item in m_items.Values)
-                    if (item.InvType == (int)InventoryType.LSL)
-                        ret.Add(item);
-            }
+            Items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
+                if (item.InvType == (int)type)
+                    ret.Add(item);
+
+            Items.LockItemsForRead(false);
 
             return ret;
         }
@@ -1335,35 +1374,32 @@ namespace OpenSim.Region.Framework.Scenes
             if (engines.Length == 0) // No engine at all
                 return ret;
 
-            Items.LockItemsForRead(true);
-            foreach (TaskInventoryItem item in m_items.Values)
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
+
+            foreach (TaskInventoryItem item in scripts)
             {
-                if (item.InvType == (int)InventoryType.LSL)
+                foreach (IScriptModule e in engines)
                 {
-                    foreach (IScriptModule e in engines)
+                    if (e != null)
                     {
-                        if (e != null)
+                        string n = e.GetXMLState(item.ItemID);
+                        if (n != String.Empty)
                         {
-                            string n = e.GetXMLState(item.ItemID);
-                            if (n != String.Empty)
+                            if (oldIDs)
+                            {
+                                if (!ret.ContainsKey(item.OldItemID))
+                                    ret[item.OldItemID] = n;
+                            }
+                            else
                             {
-                                if (oldIDs)
-                                {
-                                    if (!ret.ContainsKey(item.OldItemID))
-                                        ret[item.OldItemID] = n;
-                                }
-                                else
-                                {
-                                    if (!ret.ContainsKey(item.ItemID))
-                                        ret[item.ItemID] = n;
-                                }
-                                break;
+                                if (!ret.ContainsKey(item.ItemID))
+                                    ret[item.ItemID] = n;
                             }
+                            break;
                         }
                     }
                 }
             }
-            Items.LockItemsForRead(false);
             return ret;
         }
         
@@ -1373,27 +1409,27 @@ namespace OpenSim.Region.Framework.Scenes
             if (engines.Length == 0)
                 return;
 
+            List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
 
-            Items.LockItemsForRead(true);
-
-            foreach (TaskInventoryItem item in m_items.Values)
+            foreach (TaskInventoryItem item in scripts)
             {
-                if (item.InvType == (int)InventoryType.LSL)
+                foreach (IScriptModule engine in engines)
                 {
-                    foreach (IScriptModule engine in engines)
+                    if (engine != null)
                     {
-                        if (engine != null)
-                        {
-                            if (item.OwnerChanged)
-                                engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
-                            item.OwnerChanged = false;
-                            engine.ResumeScript(item.ItemID);
-                        }
+//                        m_log.DebugFormat(
+//                            "[PRIM INVENTORY]: Resuming script {0} {1} for {2}, OwnerChanged {3}",
+//                            item.Name, item.ItemID, item.OwnerID, item.OwnerChanged);
+
+                        engine.ResumeScript(item.ItemID);
+
+                        if (item.OwnerChanged)
+                            engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
+
+                        item.OwnerChanged = false;
                     }
                 }
             }
-
-            Items.LockItemsForRead(false);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ba0ed95..34362bf 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -45,6 +45,7 @@ using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
 
 namespace OpenSim.Region.Framework.Scenes
 {
+    [Flags]
     enum ScriptControlled : uint
     {
         CONTROL_ZERO = 0,
@@ -76,6 +77,11 @@ namespace OpenSim.Region.Framework.Scenes
 //        {
 //            m_log.Debug("[SCENE PRESENCE] Destructor called");
 //        }
+        private void TriggerScenePresenceUpdated()
+        {
+            if (m_scene != null)
+                m_scene.EventManager.TriggerScenePresenceUpdated(this);
+        }
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -497,6 +503,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //m_log.DebugFormat(
                 //    "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
                 //    Scene.RegionInfo.RegionName, Name, m_pos);
+                TriggerScenePresenceUpdated();
             }
         }
 
@@ -516,6 +523,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 m_pos = value;
+                TriggerScenePresenceUpdated();
             }
         }
 
@@ -1085,23 +1093,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void Teleport(Vector3 pos)
         {
-            bool isFlying = Flying;
-            RemoveFromPhysicalScene();
-            Velocity = Vector3.Zero;
-            CheckLandingPoint(ref pos);
-            AbsolutePosition = pos;
-            AddToPhysicalScene(isFlying);
-
-            SendTerseUpdateToAllClients();
-        }
-
-        public void TeleportWithMomentum(Vector3 pos)
-        {
-            TeleportWithMomentum(pos, null);
+            TeleportWithMomentum(pos, Vector3.Zero);
         }
 
         public void TeleportWithMomentum(Vector3 pos, Vector3? v)
         {
+            if (ParentID != (uint)0)
+                StandUp();
             bool isFlying = Flying;
             Vector3 vel = Velocity;
             RemoveFromPhysicalScene();
@@ -1281,17 +1279,27 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
             MakeRootAgent(AbsolutePosition, flying);
+            ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
+
+//            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
 
             if ((m_callbackURI != null) && !m_callbackURI.Equals(""))
             {
-                m_log.DebugFormat("[SCENE PRESENCE]: Releasing agent in URI {0}", m_callbackURI);
+                // We cannot sleep here since this would hold up the inbound packet processing thread, as
+                // CompleteMovement() is executed synchronously.  However, it might be better to delay the release
+                // here until we know for sure that the agent is active in this region.  Sending AgentMovementComplete
+                // is not enough for Imprudence clients - there appears to be a small delay (<200ms, <500ms) until they regard this
+                // region as the current region, meaning that a close sent before then will fail the teleport.
+//                System.Threading.Thread.Sleep(2000);
+
+                m_log.DebugFormat(
+                    "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}",
+                    client.Name, client.AgentId, m_callbackURI);
+
                 Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI);
                 m_callbackURI = null;
             }
 
-//            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
-
-            ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
             ValidateAndSendAppearanceAndAgentData();
 
             // Create child agents in neighbouring regions
@@ -1306,7 +1314,6 @@ namespace OpenSim.Region.Framework.Scenes
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
             }
 
-
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
@@ -1359,7 +1366,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
-//                Scene.RegionInfo.RegionName, remoteClient.Name, agentData.ControlFlags);
+//                Scene.RegionInfo.RegionName, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
 
             if (IsChildAgent)
             {
@@ -1469,14 +1476,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            lock (scriptedcontrols)
-            {
-                if (scriptedcontrols.Count > 0)
-                {
-                    SendControlToScripts((uint)flags);
-                    flags = RemoveIgnoredControls(flags, IgnoredControls);
-                }
-            }
+            uint flagsForScripts = (uint)flags;
+            flags = RemoveIgnoredControls(flags, IgnoredControls);
 
             if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
                 HandleAgentSitOnGround();
@@ -1490,6 +1491,7 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsActor actor = PhysicsActor;
             if (actor == null)
             {
+                SendControlsToScripts(flagsForScripts);
                 return;
             }
 
@@ -1569,7 +1571,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     MovementFlag |= (byte)nudgehack;
                                 }
 
-//                                m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with {1}", Name, DCF);
+                                //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with {1}", Name, DCF);
                                 MovementFlag += (byte)(uint)DCF;
                                 update_movementflag = true;
                             }
@@ -1582,7 +1584,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 && ((MovementFlag & (byte)nudgehack) == nudgehack))
                                 ) // This or is for Nudge forward
                             {
-//                                m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with lack of {1}", Name, DCF);
+                                //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with lack of {1}", Name, DCF);
                                 MovementFlag -= ((byte)(uint)DCF);
                                 update_movementflag = true;
 
@@ -1663,11 +1665,14 @@ namespace OpenSim.Region.Framework.Scenes
 //                    }
 //                }
 
-//                if (update_movementflag && ParentID == 0)
-//                    Animator.UpdateMovementAnimations();
+                if (update_movementflag && ParentID == 0)
+                    Animator.UpdateMovementAnimations();
+
+                SendControlsToScripts(flagsForScripts);
             }
 
             m_scene.EventManager.TriggerOnClientMovement(this);
+            TriggerScenePresenceUpdated();
         }
 
         /// <summary>
@@ -2607,6 +2612,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_scene.ForEachClient(SendTerseUpdateToClient);
             }
+            TriggerScenePresenceUpdated();
         }
 
         public void SendCoarseLocations(List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
@@ -3089,8 +3095,8 @@ namespace OpenSim.Region.Framework.Scenes
                     x = x / Constants.RegionSize;
                     y = y / Constants.RegionSize;
 
-                    //m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
-                    //m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
+//                    m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
+//                    m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
                     if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY))
                     {
                         byebyeRegions.Add(handle);
@@ -3392,6 +3398,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Velocity = force;
 
                 m_forceToApply = null;
+                TriggerScenePresenceUpdated();
             }
         }
 
@@ -3497,25 +3504,53 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            RaiseCollisionScriptEvents(coldata);
-
-            if (Invulnerable)
+            // Gods do not take damage and Invulnerable is set depending on parcel/region flags
+            if (Invulnerable || GodLevel > 0)
                 return;
-            
+
+            // The following may be better in the ICombatModule
+            // probably tweaking of the values for ground and normal prim collisions will be needed
             float starthealth = Health;
             uint killerObj = 0;
+            SceneObjectPart part = null;
             foreach (uint localid in coldata.Keys)
             {
-                SceneObjectPart part = Scene.GetSceneObjectPart(localid);
-
-                if (part != null && part.ParentGroup.Damage != -1.0f)
-                    Health -= part.ParentGroup.Damage;
+                if (localid == 0)
+                {
+                    part = null;
+                }
                 else
                 {
-                    if (coldata[localid].PenetrationDepth >= 0.10f)
+                    part = Scene.GetSceneObjectPart(localid);
+                }
+                if (part != null)
+                {
+                    // Ignore if it has been deleted or volume detect
+                    if (!part.ParentGroup.IsDeleted && !part.ParentGroup.IsVolumeDetect)
+                    {
+                        if (part.ParentGroup.Damage > 0.0f)
+                        {
+                            // Something with damage...
+                            Health -= part.ParentGroup.Damage;
+                            part.ParentGroup.Scene.DeleteSceneObject(part.ParentGroup, false);
+                        }
+                        else
+                        {
+                            // An ordinary prim
+                            if (coldata[localid].PenetrationDepth >= 0.10f)
+                                Health -= coldata[localid].PenetrationDepth * 5.0f;
+                        }
+                    }
+                }
+                else
+                {
+                    // 0 is the ground
+                    // what about collisions with other avatars?
+                    if (localid == 0 && coldata[localid].PenetrationDepth >= 0.10f)
                         Health -= coldata[localid].PenetrationDepth * 5.0f;
                 }
 
+
                 if (Health <= 0.0f)
                 {
                     if (localid != 0)
@@ -3531,7 +3566,16 @@ namespace OpenSim.Region.Framework.Scenes
                     ControllingClient.SendHealth(Health);
                 }
                 if (Health <= 0)
+                {
                     m_scene.EventManager.TriggerAvatarKill(killerObj, this);
+                }
+                if (starthealth == Health && Health < 100.0f)
+                {
+                    Health += 0.03f;
+                    if (Health > 100.0f)
+                        Health = 100.0f;
+                    ControllingClient.SendHealth(Health);
+                }
             }
         }
 
@@ -3613,6 +3657,63 @@ namespace OpenSim.Region.Framework.Scenes
                 return m_attachments.Count > 0;
         }
 
+        /// <summary>
+        /// Returns the total count of scripts in all parts inventories.
+        /// </summary>
+        public int ScriptCount()
+        {
+            int count = 0;
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup gobj in m_attachments)
+                {
+                    if (gobj != null)
+                    {
+                        count += gobj.ScriptCount();
+                    }
+                }
+            }
+            return count;
+        }
+
+        /// <summary>
+        /// A float the value is a representative execution time in milliseconds of all scripts in all attachments.
+        /// </summary>
+        public float ScriptExecutionTime()
+        {
+            float time = 0.0f;
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup gobj in m_attachments)
+                {
+                    if (gobj != null)
+                    {
+                        time += gobj.ScriptExecutionTime();
+                    }
+                }
+            }
+            return time;
+        }
+
+        /// <summary>
+        /// Returns the total count of running scripts in all parts.
+        /// </summary>
+        public int RunningScriptCount()
+        {
+            int count = 0;
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup gobj in m_attachments)
+                {
+                    if (gobj != null)
+                    {
+                        count += gobj.RunningScriptCount();
+                    }
+                }
+            }
+            return count;
+        }
+
         public bool HasScriptedAttachments()
         {
             lock (m_attachments)
@@ -3830,77 +3931,92 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        internal void SendControlToScripts(uint flags)
+        private void SendControlsToScripts(uint flags)
         {
-            ScriptControlled allflags = ScriptControlled.CONTROL_ZERO;
-
-            if (MouseDown)
+            // Notify the scripts only after calling UpdateMovementAnimations(), so that if a script
+            // (e.g., a walking script) checks which animation is active it will be the correct animation.
+            lock (scriptedcontrols)
             {
-                allflags = LastCommands & (ScriptControlled.CONTROL_ML_LBUTTON | ScriptControlled.CONTROL_LBUTTON);
-                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP) != 0 || (flags & unchecked((uint)AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP)) != 0)
+                if (scriptedcontrols.Count <= 0)
+                    return;
+
+                ScriptControlled allflags = ScriptControlled.CONTROL_ZERO;
+    
+                if (MouseDown)
                 {
-                    allflags = ScriptControlled.CONTROL_ZERO;
+                    allflags = LastCommands & (ScriptControlled.CONTROL_ML_LBUTTON | ScriptControlled.CONTROL_LBUTTON);
+                    if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP) != 0 || (flags & unchecked((uint)AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP)) != 0)
+                    {
+                        allflags = ScriptControlled.CONTROL_ZERO;
+                        MouseDown = true;
+                    }
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_ML_LBUTTON;
                     MouseDown = true;
                 }
-            }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_LBUTTON;
+                    MouseDown = true;
+                }
+    
+                // find all activated controls, whether the scripts are interested in them or not
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_FWD;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_BACK;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_UP;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_DOWN;
+                }
 
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_ML_LBUTTON;
-                MouseDown = true;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_LBUTTON;
-                MouseDown = true;
-            }
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_LEFT;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_RIGHT;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_ROT_RIGHT;
+                }
+    
+                if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
+                {
+                    allflags |= ScriptControlled.CONTROL_ROT_LEFT;
+                }
 
-            // find all activated controls, whether the scripts are interested in them or not
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_FWD;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_BACK;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_UP;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_DOWN;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_LEFT;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_RIGHT;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_ROT_RIGHT;
-            }
-            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
-            {
-                allflags |= ScriptControlled.CONTROL_ROT_LEFT;
-            }
-            // optimization; we have to check per script, but if nothing is pressed and nothing changed, we can skip that
-            if (allflags != ScriptControlled.CONTROL_ZERO || allflags != LastCommands)
-            {
-                lock (scriptedcontrols)
+                // optimization; we have to check per script, but if nothing is pressed and nothing changed, we can skip that
+                if (allflags != ScriptControlled.CONTROL_ZERO || allflags != LastCommands)
                 {
                     foreach (KeyValuePair<UUID, ScriptControllers> kvp in scriptedcontrols)
                     {
                         UUID scriptUUID = kvp.Key;
                         ScriptControllers scriptControlData = kvp.Value;
-
+    
                         ScriptControlled localHeld = allflags & scriptControlData.eventControls;     // the flags interesting for us
                         ScriptControlled localLast = LastCommands & scriptControlData.eventControls; // the activated controls in the last cycle
                         ScriptControlled localChange = localHeld ^ localLast;                        // the changed bits
+
                         if (localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO)
                         {
                             // only send if still pressed or just changed
@@ -3908,9 +4024,9 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                 }
+    
+                LastCommands = allflags;
             }
-
-            LastCommands = allflags;
         }
 
         internal static AgentManager.ControlFlags RemoveIgnoredControls(AgentManager.ControlFlags flags, ScriptControlled ignored)
@@ -3990,7 +4106,7 @@ namespace OpenSim.Region.Framework.Scenes
                 land.LandData.UserLocation != Vector3.Zero &&
                 land.LandData.OwnerID != m_uuid &&
                 (!m_scene.Permissions.IsGod(m_uuid)) &&
-                (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)))
+                (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)))
             {
                 float curr = Vector3.Distance(AbsolutePosition, pos);
                 if (Vector3.Distance(land.LandData.UserLocation, pos) < curr)
@@ -4010,7 +4126,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (GodLevel < 200 &&
                     ((!m_scene.Permissions.IsGod(m_uuid) &&
-                    !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || 
+                    !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || 
                     (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
                     (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
                 {
@@ -4018,28 +4134,93 @@ namespace OpenSim.Region.Framework.Scenes
                     if (spawnPoints.Length == 0)
                         return;
 
-                    float distance = 9999;
-                    int closest = -1;
+                    int index;
+                    bool selected = false;
 
-                    for (int i = 0 ; i < spawnPoints.Length ; i++)
+                    switch (m_scene.SpawnPointRouting)
                     {
-                        Vector3 spawnPosition = spawnPoints[i].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
-                        Vector3 offset = spawnPosition - pos;
-                        float d = Vector3.Mag(offset);
-                        if (d >= distance)
-                            continue;
-                        ILandObject land = m_scene.LandChannel.GetLandObject(spawnPosition.X, spawnPosition.Y);
-                        if (land == null)
-                            continue;
-                        if (land.IsEitherBannedOrRestricted(UUID))
-                            continue;
-                        distance = d;
-                        closest = i;
-                    }
-                    if (closest == -1)
-                        return;
+                        case "closest":
+
+                            float distance = 9999;
+                            int closest = -1;
+        
+                            for (int i = 0; i < spawnPoints.Length; i++)
+                            {
+                                Vector3 spawnPosition = spawnPoints[i].GetLocation(
+                                    telehub.AbsolutePosition,
+                                    telehub.GroupRotation
+                                );
+                                Vector3 offset = spawnPosition - pos;
+                                float d = Vector3.Mag(offset);
+                                if (d >= distance)
+                                    continue;
+                                ILandObject land = m_scene.LandChannel.GetLandObject(spawnPosition.X, spawnPosition.Y);
+                                if (land == null)
+                                    continue;
+                                if (land.IsEitherBannedOrRestricted(UUID))
+                                    continue;
+                                distance = d;
+                                closest = i;
+                            }
+                            if (closest == -1)
+                                return;
+                            
+                            pos = spawnPoints[closest].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                            return;
+
+                        case "random":
 
-                    pos = spawnPoints[closest].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                            do
+                            {
+                                index = Util.RandomClass.Next(spawnPoints.Length - 1);
+                                
+                                Vector3 spawnPosition = spawnPoints[index].GetLocation(
+                                    telehub.AbsolutePosition,
+                                    telehub.GroupRotation
+                                );
+                                // SpawnPoint sp = spawnPoints[index];
+
+                                ILandObject land = m_scene.LandChannel.GetLandObject(spawnPosition.X, spawnPosition.Y);
+                                if (land == null || land.IsEitherBannedOrRestricted(UUID))
+                                    selected = false;
+                                else
+                                    selected = true;
+
+                            } while ( selected == false);
+
+                            pos = spawnPoints[index].GetLocation(
+                                telehub.AbsolutePosition,
+                                telehub.GroupRotation
+                            );
+                            return;
+
+                        case "sequence":
+
+                            do
+                            {
+                                index = m_scene.SpawnPoint();
+                                
+                                Vector3 spawnPosition = spawnPoints[index].GetLocation(
+                                    telehub.AbsolutePosition,
+                                    telehub.GroupRotation
+                                );
+                                // SpawnPoint sp = spawnPoints[index];
+
+                                ILandObject land = m_scene.LandChannel.GetLandObject(spawnPosition.X, spawnPosition.Y);
+                                if (land == null || land.IsEitherBannedOrRestricted(UUID))
+                                    selected = false;
+                                else
+                                    selected = true;
+
+                            } while (selected == false);
+
+                            pos = spawnPoints[index].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                            ;
+                            return;
+
+                        default:
+                            return;
+                    }
                 }
             }
         }
@@ -4084,7 +4265,7 @@ namespace OpenSim.Region.Framework.Scenes
                         GodLevel < 200 &&
                         ((land.LandData.OwnerID != m_uuid && 
                           !m_scene.Permissions.IsGod(m_uuid) &&
-                          !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || 
+                          !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) || 
                          (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
                          (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
                     {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
index ab6311b..4a21dc9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using NUnit.Framework;
 using OpenMetaverse;
@@ -68,11 +69,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 position = new Vector3(200,200,21);
             
             foreach (Border b in testborders)
-            {
                 Assert.That(!b.TestCross(position));
 
-            }
-
             position = new Vector3(200,280,21);
             Assert.That(NorthBorder.TestCross(position));
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index a5d2b23..ea9fc93 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     {
         static public Random random;
         SceneObjectGroup found;
-        Scene scene = SceneHelpers.SetupScene();
+        Scene scene = new SceneHelpers().SetupScene();
 
         [Test]
         public void T010_AddObjects()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 9a60e50..d23c965 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -26,7 +26,9 @@
  */
 
 using System;
+using System.IO;
 using System.Reflection;
+using System.Text;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -44,7 +46,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDuplicateObject()
         {
             TestHelpers.InMethod();
-            Scene scene = SceneHelpers.SetupScene();
+//            TestHelpers.EnableLogging();
+
+            Scene scene = new SceneHelpers().SetupScene();
 
             UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");
             string part1Name = "part1";
@@ -82,6 +86,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(dupePart1.PhysActor, Is.Not.Null);
             Assert.That(dupePart2.PhysActor, Is.Not.Null);
             */
+
+//            TestHelpers.DisableLogging();
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 7737d8e..453e077 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             int partsToTestCount = 3;
 
             SceneObjectGroup so
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
 
             string obj1Name = "Alfred";
             string obj2Name = "Betty";
@@ -152,7 +152,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             int partsToTestCount = 3;
 
             SceneObjectGroup so
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
             scene.DeleteSceneObject(part.ParentGroup, false);
 
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 654b1a2..0076f41 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index be5b4a8..1add3dd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID ownerId = TestHelpers.ParseTail(0x1);
             int nParts = 3;
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(nParts, ownerId, "TestLinkToSelf_", 0x10);
             scene.AddSceneObject(sog1);
             scene.LinkObjects(ownerId, sog1.LocalId, new List<uint>() { sog1.Parts[1].LocalId });
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             
             bool debugtest = false; 
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneObjectPart part1 = SceneHelpers.AddSceneObject(scene);
             SceneObjectGroup grp1 = part1.ParentGroup;
             SceneObjectPart part2 = SceneHelpers.AddSceneObject(scene);
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             
             bool debugtest = false;
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneObjectPart part1 = SceneHelpers.AddSceneObject(scene);
             SceneObjectGroup grp1 = part1.ParentGroup;
             SceneObjectPart part2 = SceneHelpers.AddSceneObject(scene);
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
@@ -325,7 +325,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index b49c6e7..0a94c19 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene).ParentGroup;
 
             g1.GroupResize(new Vector3(2, 3, 4));
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
 
             SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(2, UUID.Zero);
             g1.RootPart.Scale = new Vector3(2, 3, 4);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
index c582cf6..d2361f8 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            UUID itemId = TestHelpers.ParseTail(0x2);
             string itemName = "Test Script Item";
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
             scene.AddNewSceneObject(so, true);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
new file mode 100644
index 0000000..6d255aa
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -0,0 +1,154 @@
+/*
+ * 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.Reflection;
+using System.Threading;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Spatial scene object tests (will eventually cover root and child part position, rotation properties, etc.)
+    /// </summary>
+    [TestFixture]
+    public class SceneObjectSpatialTests
+    {
+        TestScene m_scene;
+        UUID m_ownerId = TestHelpers.ParseTail(0x1);
+
+        [SetUp]
+        public void SetUp()
+        {
+            m_scene = new SceneHelpers().SetupScene();
+        }
+
+        [Test]
+        public void TestGetSceneObjectGroupPosition()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 position = new Vector3(10, 20, 30);
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
+            so.AbsolutePosition = position;
+            m_scene.AddNewSceneObject(so, false);
+
+            Assert.That(so.AbsolutePosition, Is.EqualTo(position));
+        }
+
+        [Test]
+        public void TestGetRootPartPosition()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 partPosition = new Vector3(10, 20, 30);
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
+            so.AbsolutePosition = partPosition;
+            m_scene.AddNewSceneObject(so, false);
+
+            Assert.That(so.RootPart.AbsolutePosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.GroupPosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.GetWorldPosition(), Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.RelativePosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.OffsetPosition, Is.EqualTo(Vector3.Zero));
+        }
+
+        [Test]
+        public void TestGetChildPartPosition()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 rootPartPosition = new Vector3(10, 20, 30);
+            Vector3 childOffsetPosition = new Vector3(2, 3, 4);
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(2, m_ownerId, "obj1", 0x10);
+            so.AbsolutePosition = rootPartPosition;
+            so.Parts[1].OffsetPosition = childOffsetPosition;
+
+            m_scene.AddNewSceneObject(so, false);
+
+            // Calculate child absolute position.
+            Vector3 childPosition = new Vector3(rootPartPosition + childOffsetPosition);
+
+            SceneObjectPart childPart = so.Parts[1];
+            Assert.That(childPart.AbsolutePosition, Is.EqualTo(childPosition));
+            Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition));
+            Assert.That(childPart.GetWorldPosition(), Is.EqualTo(childPosition));
+            Assert.That(childPart.RelativePosition, Is.EqualTo(childOffsetPosition));
+            Assert.That(childPart.OffsetPosition, Is.EqualTo(childOffsetPosition));
+        }
+
+        [Test]
+        public void TestGetChildPartPositionAfterObjectRotation()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 rootPartPosition = new Vector3(10, 20, 30);
+            Vector3 childOffsetPosition = new Vector3(2, 3, 4);
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(2, m_ownerId, "obj1", 0x10);
+            so.AbsolutePosition = rootPartPosition;
+            so.Parts[1].OffsetPosition = childOffsetPosition;
+
+            m_scene.AddNewSceneObject(so, false);
+
+            so.UpdateGroupRotationR(Quaternion.CreateFromEulers(0, 0, -90 * Utils.DEG_TO_RAD));
+
+            // Calculate child absolute position.
+            Vector3 rotatedChildOffsetPosition
+                = new Vector3(childOffsetPosition.Y, -childOffsetPosition.X, childOffsetPosition.Z);
+
+            Vector3 childPosition = new Vector3(rootPartPosition + rotatedChildOffsetPosition);
+
+            SceneObjectPart childPart = so.Parts[1];
+
+            // FIXME: Should be childPosition after rotation?
+            Assert.That(childPart.AbsolutePosition, Is.EqualTo(rootPartPosition + childOffsetPosition));
+
+            Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition));
+            Assert.That(childPart.GetWorldPosition(), Is.EqualTo(childPosition));
+
+            // Relative to root part as (0, 0, 0)
+            Assert.That(childPart.RelativePosition, Is.EqualTo(childOffsetPosition));
+
+            // Relative to root part as (0, 0, 0)
+            Assert.That(childPart.OffsetPosition, Is.EqualTo(childOffsetPosition));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index 2a342d5..742c769 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using NUnit.Framework;
 using OpenMetaverse;
@@ -43,24 +44,141 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     [TestFixture]
     public class SceneObjectStatusTests
     {
+        private TestScene m_scene;
+        private UUID m_ownerId = TestHelpers.ParseTail(0x1);
+        private SceneObjectGroup m_so1;
+        private SceneObjectGroup m_so2;
+
+        [SetUp]
+        public void Init()
+        {
+            m_scene = new SceneHelpers().SetupScene();
+            m_so1 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so1", 0x10);
+            m_so2 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so2", 0x20);
+        }
+
         [Test]
-        public void TestSetPhantom()
+        public void TestSetPhantomSinglePrim()
         {
             TestHelpers.InMethod();
 
-//            Scene scene = SceneSetupHelpers.SetupScene();
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero);
-            SceneObjectPart rootPart = so.RootPart;
+            m_scene.AddSceneObject(m_so1);
+
+            SceneObjectPart rootPart = m_so1.RootPart;
             Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
 
-            so.ScriptSetPhantomStatus(true);
+            m_so1.ScriptSetPhantomStatus(true);
 
 //            Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags);
             Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Phantom));
 
-            so.ScriptSetPhantomStatus(false);
+            m_so1.ScriptSetPhantomStatus(false);
 
             Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));            
         }
+
+        [Test]
+        public void TestSetPhysicsSinglePrim()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+
+            SceneObjectPart rootPart = m_so1.RootPart;
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
+
+            m_so1.ScriptSetPhysicsStatus(true);
+
+//            Console.WriteLine("so.RootPart.Flags [{0}]", so.RootPart.Flags);
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));
+
+            m_so1.ScriptSetPhysicsStatus(false);
+
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
+        }
+        
+        [Test]
+        public void TestSetPhysicsLinkset()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_scene.AddSceneObject(m_so2);
+
+            m_scene.LinkObjects(m_ownerId, m_so1.LocalId, new List<uint>() { m_so2.LocalId });
+
+            m_so1.ScriptSetPhysicsStatus(true);
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.Physics));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.Physics));
+
+            m_so1.ScriptSetPhysicsStatus(false);
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.None));
+
+            m_so1.ScriptSetPhysicsStatus(true);
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.Physics));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.Physics));
+        }
+
+        /// <summary>
+        /// Test that linking results in the correct physical status for all linkees.
+        /// </summary>
+        [Test]
+        public void TestLinkPhysicsBothPhysical()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_scene.AddSceneObject(m_so2);
+
+            m_so1.ScriptSetPhysicsStatus(true);
+            m_so2.ScriptSetPhysicsStatus(true);
+
+            m_scene.LinkObjects(m_ownerId, m_so1.LocalId, new List<uint>() { m_so2.LocalId });
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.Physics));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.Physics));
+        }
+
+        /// <summary>
+        /// Test that linking results in the correct physical status for all linkees.
+        /// </summary>
+        [Test]
+        public void TestLinkPhysicsRootPhysicalOnly()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_scene.AddSceneObject(m_so2);
+
+            m_so1.ScriptSetPhysicsStatus(true);
+
+            m_scene.LinkObjects(m_ownerId, m_so1.LocalId, new List<uint>() { m_so2.LocalId });
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.Physics));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.Physics));
+        }
+
+        /// <summary>
+        /// Test that linking results in the correct physical status for all linkees.
+        /// </summary>
+        [Test]
+        public void TestLinkPhysicsChildPhysicalOnly()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_scene.AddSceneObject(m_so2);
+
+            m_so2.ScriptSetPhysicsStatus(true);
+
+            m_scene.LinkObjects(m_ownerId, m_so1.LocalId, new List<uint>() { m_so2.LocalId });
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
+            Assert.That(m_so1.Parts[1].Flags, Is.EqualTo(PrimFlags.None));
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index c13d82e..c7eaff9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             
             IConfig startupConfig = configSource.AddConfig("Startup");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index ed9b179..1aa48d7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -67,10 +67,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void Init()
         {
             TestHelpers.InMethod();
-            
-            scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
-            scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
-            scene3 = SceneHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000);
+
+            SceneHelpers sh = new SceneHelpers();
+
+            scene = sh.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
+            scene2 = sh.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
+            scene3 = sh.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000);
 
             ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
             interregionComms.Initialise(new IniConfigSource());
@@ -101,7 +103,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
 
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(sp.UUID), Is.Not.Null);
@@ -126,7 +128,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             IConfig config = configSource.AddConfig("Modules");
             config.Set("SimulationServices", "LocalSimulationConnectorModule");
 
-            TestScene scene = SceneHelpers.SetupScene();
+            SceneHelpers sceneHelpers = new SceneHelpers();
+            TestScene scene = sceneHelpers.SetupScene();
             SceneHelpers.SetupSceneModules(scene, configSource, lsc);
 
             UUID agentId = TestHelpers.ParseTail(0x01);
@@ -176,8 +179,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             
 //            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
-            TestScene myScene1 = SceneHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
-            TestScene myScene2 = SceneHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
+            TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
+            TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
 
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
index 89f8007..646e5fa 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
             sp.Flying = true;
             sp.PhysicsCollisionUpdate(new CollisionEventUpdate());
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
index cfea10d..1d1ff88 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [SetUp]
         public void Init()
         {
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
         }
 
         [Test]
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index b7b8db4..313e350 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [SetUp]
         public void Init()
         {
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             m_sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index bebc10c..ea4fb66 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -34,10 +34,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
-using System.Threading;
+using System.IO;
+using System.Text;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
@@ -47,145 +50,190 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     [TestFixture]
     public class ScenePresenceTeleportTests
     {
-        /// <summary>
-        /// Test a teleport between two regions that are not neighbours and do not share any neighbours in common.
-        /// </summary>
-        /// Does not yet do what is says on the tin.
-        /// Commenting for now
-        //[Test, LongRunning]
-        public void TestSimpleNotNeighboursTeleport()
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
+        [Test]
+        public void TestSameRegionTeleport()
         {
             TestHelpers.InMethod();
-            ThreadRunResults results = new ThreadRunResults();
-            results.Result = false;
-            results.Message = "Test did not run";
-            TestRunning testClass = new TestRunning(results);
+//            log4net.Config.XmlConfigurator.Configure();
 
-            Thread testThread = new Thread(testClass.run);
+            EntityTransferModule etm = new EntityTransferModule();
 
-            // Seems kind of redundant to start a thread and then join it, however..   We need to protect against
-            // A thread abort exception in the simulator code.
-            testThread.Start();
-            testThread.Join();
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            // Not strictly necessary since FriendsModule assumes it is the default (!)
+            config.Configs["Modules"].Set("EntityTransferModule", etm.Name);
 
-            Assert.That(testClass.results.Result, Is.EqualTo(true), testClass.results.Message);
-            // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
+            TestScene scene = new SceneHelpers().SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            SceneHelpers.SetupSceneModules(scene, config, etm);
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+            sp.AbsolutePosition = new Vector3(30, 31, 32);
+            scene.RequestTeleportLocation(
+                sp.ControllingClient,
+                scene.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            Assert.That(sp.AbsolutePosition, Is.EqualTo(teleportPosition));
+
+            // Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
+            // position instead).
+//            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
         }
 
-        [TearDown]
-        public void TearDown()
+        [Test]
+        public void TestSameSimulatorSeparatedRegionsTeleport()
         {
-            try
-            {
-                if (MainServer.Instance != null) MainServer.Instance.Stop();
-            }
-            catch (NullReferenceException)
-            { }
-        }
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
 
-    }
+            UUID userId = TestHelpers.ParseTail(0x1);
 
-    public class ThreadRunResults
-    {
-        public bool Result = false;
-        public string Message = string.Empty;
-    }
+            EntityTransferModule etm = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
 
-    public class TestRunning
-    {
-        public ThreadRunResults results;
-        public TestRunning(ThreadRunResults t)
-        {
-            results = t;
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etm.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
+
+            // In order to run a single threaded regression test we do not want the entity transfer module waiting
+            // for a callback from the destination scene before removing its avatar data.
+            entityTransferConfig.Set("wait_for_callback", false);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1002, 1000);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, etm, lscm);
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            sp.AbsolutePosition = new Vector3(30, 31, 32);
+
+            // XXX: A very nasty hack to tell the client about the destination scene without having to crank the whole
+            // UDP stack (?)
+//            ((TestClient)sp.ControllingClient).TeleportTargetScene = sceneB;
+
+            sceneA.RequestTeleportLocation(
+                sp.ControllingClient,
+                sceneB.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            ((TestClient)sp.ControllingClient).CompleteTeleportClientSide();
+
+            Assert.That(sceneA.GetScenePresence(userId), Is.Null);
+
+            ScenePresence sceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(sceneBSp, Is.Not.Null);
+            Assert.That(sceneBSp.Scene.RegionInfo.RegionName, Is.EqualTo(sceneB.RegionInfo.RegionName));
+            Assert.That(sceneBSp.AbsolutePosition, Is.EqualTo(teleportPosition));
+
+            // TODO: Add assertions to check correct circuit details in both scenes.
+
+            // Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
+            // position instead).
+//            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
         }
-        public void run(object o)
+
+        [Test]
+        public void TestSameSimulatorNeighbouringRegionsTeleport()
         {
-            
-            //results.Result = true;
-            log4net.Config.XmlConfigurator.Configure();
-
-            UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
-            UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
-
-            // shared module
-            ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
-
-
-            Scene sceneB = SceneHelpers.SetupScene("sceneB", sceneBId, 1010, 1010);
-            SceneHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
-            sceneB.RegisterRegionWithGrid();
-
-            Scene sceneA = SceneHelpers.SetupScene("sceneA", sceneAId, 1000, 1000);
-            SceneHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
-            sceneA.RegisterRegionWithGrid();
-
-            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
-            TestClient client = (TestClient)SceneHelpers.AddScenePresence(sceneA, agentId).ControllingClient;
-
-            ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();
-
-            results.Result = (sceneACapsModule.GetCapsPath(agentId) == client.CapsSeedUrl);
-            
-            if (!results.Result)
-            {
-                results.Message = "Incorrect caps object path set up in sceneA";
-                return;
-            }
-
-            /*
-            Assert.That(
-                sceneACapsModule.GetCapsPath(agentId),
-                Is.EqualTo(client.CapsSeedUrl),
-                "Incorrect caps object path set up in sceneA");
-            */
-            // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
-            
-
-            client.TeleportTargetScene = sceneB;
-            client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
-
-            results.Result = (sceneB.GetScenePresence(agentId) != null);
-            if (!results.Result)
-            {
-                results.Message = "Client does not have an agent in sceneB";
-                return;
-            }
-
-            //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");
-            
-            //Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
-
-            results.Result = (sceneA.GetScenePresence(agentId) == null);
-            if (!results.Result)
-            {
-                results.Message = "Client still had an agent in sceneA";
-                return;
-            }
-
-            ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
-
-
-            results.Result = ("http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort +
-                              "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/" == client.CapsSeedUrl);
-            if (!results.Result)
-            {
-                results.Message = "Incorrect caps object path set up in sceneB";
-                return;
-            }
-
-            // Temporary assertion - caps url construction should at least be doable through a method.
-            /*
-            Assert.That(
-                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
-                Is.EqualTo(client.CapsSeedUrl),
-                "Incorrect caps object path set up in sceneB");
-            */
-            // This assertion will currently fail since we don't remove the caps paths when no longer needed
-            //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");
-
-            // TODO: Check that more of everything is as it should be
-
-            // TODO: test what happens if we try to teleport to a region that doesn't exist
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            EntityTransferModule etm = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etm.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
+
+            // In order to run a single threaded regression test we do not want the entity transfer module waiting
+            // for a callback from the destination scene before removing its avatar data.
+            entityTransferConfig.Set("wait_for_callback", false);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1001, 1000);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, etm, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, new CapabilitiesModule());
+            SceneHelpers.SetupSceneModules(sceneB, new CapabilitiesModule());
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            originalSp.AbsolutePosition = new Vector3(30, 31, 32);
+
+            ScenePresence beforeSceneASp = sceneA.GetScenePresence(userId);
+            Assert.That(beforeSceneASp, Is.Not.Null);
+            Assert.That(beforeSceneASp.IsChildAgent, Is.False);
+
+            ScenePresence beforeSceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(beforeSceneBSp, Is.Not.Null);
+            Assert.That(beforeSceneBSp.IsChildAgent, Is.True);
+
+            // XXX: A very nasty hack to tell the client about the destination scene without having to crank the whole
+            // UDP stack (?)
+//            ((TestClient)beforeSceneASp.ControllingClient).TeleportTargetScene = sceneB;
+
+            sceneA.RequestTeleportLocation(
+                beforeSceneASp.ControllingClient,
+                sceneB.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            ((TestClient)beforeSceneASp.ControllingClient).CompleteTeleportClientSide();
+
+            ScenePresence afterSceneASp = sceneA.GetScenePresence(userId);
+            Assert.That(afterSceneASp, Is.Not.Null);
+            Assert.That(afterSceneASp.IsChildAgent, Is.True);
+
+            ScenePresence afterSceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(afterSceneBSp, Is.Not.Null);
+            Assert.That(afterSceneBSp.IsChildAgent, Is.False);
+            Assert.That(afterSceneBSp.Scene.RegionInfo.RegionName, Is.EqualTo(sceneB.RegionInfo.RegionName));
+            Assert.That(afterSceneBSp.AbsolutePosition, Is.EqualTo(teleportPosition));
+
+            // TODO: Add assertions to check correct circuit details in both scenes.
+
+            // Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
+            // position instead).
+//            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
+
+//            TestHelpers.DisableLogging();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 5c9a77d..d722a09 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             scene.Update(1);
             
             Assert.That(scene.Frame, Is.EqualTo(1));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 55c80f5..d15141b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 55fc1e7..44d2d45 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
             UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
             InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
             UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
             InventoryFolderBase folder1
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index d9fe87c..198e487 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void Init()
         {
             // FIXME: We don't need a full scene here - it would be enough to set up the asset service.
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             m_assetService = scene.AssetService;
             m_uuidGatherer = new UuidGatherer(m_assetService);
         }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
new file mode 100644
index 0000000..a95514c
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
@@ -0,0 +1,195 @@
+/*
+ * 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.Linq;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Statistics;
+using OpenSim.Region.ClientStack.LindenUDP;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.Avatar.Attachments
+{
+    /// <summary>
+    /// A module that just holds commands for inspecting avatar appearance.
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsCommandModule")]
+    public class AttachmentsCommandModule : ISharedRegionModule
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private List<Scene> m_scenes = new List<Scene>();
+//        private IAvatarFactoryModule m_avatarFactory;
+
+        public string Name { get { return "Attachments Command Module"; } }
+        
+        public Type ReplaceableInterface { get { return null; } }
+        
+        public void Initialise(IConfigSource source)
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: INITIALIZED MODULE");
+        }
+        
+        public void PostInitialise()
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: POST INITIALIZED MODULE");
+        }
+        
+        public void Close()
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: CLOSED MODULE");
+        }
+        
+        public void AddRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+        }
+        
+        public void RemoveRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+            
+            lock (m_scenes)
+                m_scenes.Remove(scene);
+        }        
+        
+        public void RegionLoaded(Scene scene)
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+            
+            lock (m_scenes)
+                m_scenes.Add(scene);
+
+            scene.AddCommand(
+                "Users", this, "attachments show",
+                "attachments show [<first-name> <last-name>]",
+                "Show attachment information for avatars in this simulator.",
+                HandleShowAttachmentsCommand);
+        }
+
+        protected void HandleShowAttachmentsCommand(string module, string[] cmd)
+        {
+            if (cmd.Length != 2 && cmd.Length < 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: attachments show [<first-name> <last-name>]");
+                return;
+            }
+
+            bool targetNameSupplied = false;
+            string optionalTargetFirstName = null;
+            string optionalTargetLastName = null;
+
+            if (cmd.Length >= 4)
+            {
+                targetNameSupplied = true;
+                optionalTargetFirstName = cmd[2];
+                optionalTargetLastName = cmd[3];
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            lock (m_scenes)
+            {
+                foreach (Scene scene in m_scenes)
+                {
+                    if (targetNameSupplied)
+                    {
+                        ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
+                        if (sp != null && !sp.IsChildAgent)
+                            GetAttachmentsReport(sp, sb);
+                    }
+                    else
+                    {
+                        scene.ForEachRootScenePresence(sp => GetAttachmentsReport(sp, sb));
+                    }
+                }
+            }
+
+            MainConsole.Instance.Output(sb.ToString());
+        }
+
+        private void GetAttachmentsReport(ScenePresence sp, StringBuilder sb)
+        {
+            sb.AppendFormat("Attachments for {0}\n", sp.Name);
+
+            ConsoleTable ct = new ConsoleTable() { Indent = 2 };
+            ct.Columns.Add(new ConsoleTableColumn("Attachment Name", 36));
+            ct.Columns.Add(new ConsoleTableColumn("Local ID", 10));
+            ct.Columns.Add(new ConsoleTableColumn("Item ID", 36));
+            ct.Columns.Add(new ConsoleTableColumn("Attach Point", 14));
+            ct.Columns.Add(new ConsoleTableColumn("Position", 15));
+
+//            sb.AppendFormat(
+//                "  {0,-36}  {1,-10}  {2,-36}  {3,-14}  {4,-15}\n",
+//                "Attachment Name", "Local ID", "Item ID", "Attach Point", "Position");
+
+            List<SceneObjectGroup> attachmentObjects = sp.GetAttachments();
+            foreach (SceneObjectGroup attachmentObject in attachmentObjects)
+            {
+//                InventoryItemBase attachmentItem
+//                    = m_scenes[0].InventoryService.GetItem(new InventoryItemBase(attachmentObject.FromItemID));
+
+//                if (attachmentItem == null)
+//                {
+//                    sb.AppendFormat(
+//                        "WARNING: Couldn't find attachment for item {0} at point {1}\n",
+//                        attachmentData.ItemID, (AttachmentPoint)attachmentData.AttachPoint);
+//                        continue;
+//                }
+//                else
+//                {
+//                    sb.AppendFormat(
+//                        "  {0,-36}  {1,-10}  {2,-36}  {3,-14}  {4,-15}\n",
+//                        attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID,
+//                        (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos);
+                    ct.Rows.Add(
+                        new ConsoleTableRow(
+                            new List<string>()
+                            {
+                                attachmentObject.Name,
+                                attachmentObject.LocalId.ToString(),
+                                attachmentObject.FromItemID.ToString(),
+                                ((AttachmentPoint)attachmentObject.AttachmentPoint).ToString(),
+                                attachmentObject.RootPart.AttachedPos.ToString()
+                            }));
+//                }
+            }
+
+            ct.AddToStringBuilder(sb);
+            sb.Append("\n");
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index e68f9d0..2602050 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
         private Scene m_scene;
         private IFriendsModule m_friendsModule;
         private IUserManagement m_userManagementModule;
+        private IPresenceService m_presenceService;
 
 //        private IAvatarFactoryModule m_avatarFactory;
         
@@ -99,8 +100,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
             m_userManagementModule = m_scene.RequestModuleInterface<IUserManagement>();
+            m_presenceService = m_scene.RequestModuleInterface<IPresenceService>();
 
-            if (m_friendsModule != null && m_userManagementModule != null)
+            if (m_friendsModule != null && m_userManagementModule != null && m_presenceService != null)
             {
                 m_scene.AddCommand(
                     "Friends", this, "friends show",
@@ -162,7 +164,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             MainConsole.Instance.OutputFormat("Friends for {0} {1} {2}:", firstName, lastName, userId);
 
-            MainConsole.Instance.OutputFormat("UUID, Name, MyFlags, TheirFlags");
+            MainConsole.Instance.OutputFormat(
+                "{0,-36}  {1,-36}  {2,-7}  {3,7}  {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
 
             foreach (FriendInfo friend in friends)
             {
@@ -175,14 +178,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
                 UUID friendId;
                 string friendName;
+                string onlineText;
 
                 if (UUID.TryParse(friend.Friend, out friendId))
                     friendName = m_userManagementModule.GetUserName(friendId);
                 else
                     friendName = friend.Friend;
 
+                OpenSim.Services.Interfaces.PresenceInfo[] pi = m_presenceService.GetAgents(new string[] { friend.Friend });
+                if (pi.Length > 0)
+                    onlineText = "online";
+                else
+                    onlineText = "offline";
+
                 MainConsole.Instance.OutputFormat(
-                    "{0} {1} {2} {3}", friend.Friend, friendName, friend.MyFlags, friend.TheirFlags);
+                    "{0,-36}  {1,-36}  {2,-7}  {3,-7}  {4,-10}",
+                    friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
             }
         }
     }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 8af3652..6c53d95 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -306,30 +306,35 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 agentID, caps, scene.RegionInfo.RegionName);
 
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("ProvisionVoiceAccountRequest",
-                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
-                                                                                               agentID, caps);
-                                                       }));
-            caps.RegisterHandler("ParcelVoiceInfoRequest",
-                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
-                                                                                         agentID, caps);
-                                                       }));
-            caps.RegisterHandler("ChatSessionRequest",
-                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ChatSessionRequest(scene, request, path, param,
-                                                                                     agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "ProvisionVoiceAccountRequest",
+                new RestStreamHandler(
+                    "POST",
+                    capsBase + m_provisionVoiceAccountRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
+                    "ProvisionVoiceAccountRequest",
+                    agentID.ToString()));
+
+            caps.RegisterHandler(
+                "ParcelVoiceInfoRequest",
+                new RestStreamHandler(
+                    "POST",
+                    capsBase + m_parcelVoiceInfoRequestPath,
+                        (request, path, param, httpRequest, httpResponse)
+                            => ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
+                    "ParcelVoiceInfoRequest",
+                    agentID.ToString()));
+
+            caps.RegisterHandler(
+                "ChatSessionRequest",
+                new RestStreamHandler(
+                    "POST",
+                    capsBase + m_chatSessionRequestPath,
+                            (request, path, param, httpRequest, httpResponse)
+                                => ChatSessionRequest(scene, request, path, param, agentID, caps),
+                    "ChatSessionRequest",
+                    agentID.ToString()));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 4dbac1d..396d4c5 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -406,30 +406,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             m_log.DebugFormat("[VivoxVoice] OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
 
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("ProvisionVoiceAccountRequest",
-                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
-                                                                                               agentID, caps);
-                                                       }));
-            caps.RegisterHandler("ParcelVoiceInfoRequest",
-                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
-                                                                                         agentID, caps);
-                                                       }));
-            caps.RegisterHandler("ChatSessionRequest",
-                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ChatSessionRequest(scene, request, path, param,
-                                                                                     agentID, caps);
-                                                       }));
+
+            caps.RegisterHandler(
+                "ProvisionVoiceAccountRequest",
+                 new RestStreamHandler(
+                    "POST",
+                    capsBase + m_provisionVoiceAccountRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
+                    "ProvisionVoiceAccountRequest",
+                    agentID.ToString()));
+
+            caps.RegisterHandler(
+                "ParcelVoiceInfoRequest",
+                 new RestStreamHandler(
+                    "POST",
+                    capsBase + m_parcelVoiceInfoRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
+                    "ParcelVoiceInfoRequest",
+                    agentID.ToString()));
+
+            caps.RegisterHandler(
+                "ChatSessionRequest",
+                 new RestStreamHandler(
+                    "POST",
+                    capsBase + m_chatSessionRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ChatSessionRequest(scene, request, path, param, agentID, caps),
+                    "ChatSessionRequest",
+                    agentID.ToString()));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 130513d..5d57f70 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -1401,9 +1401,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
-                        m_log.InfoFormat("[SIMIAN GROUPS CONNECTOR] request failed {0}",CacheKey);
+                        m_log.ErrorFormat("[SIMIAN GROUPS CONNECTOR]: request failed {0}", CacheKey);
                     }
                     
                     // and cache the response
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index d2f6327..ac638f1 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Groups");            
             config.Set("Enabled", true);
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
new file mode 100644
index 0000000..34894ba
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -0,0 +1,500 @@
+/*
+ * Copyright (c) Contributors 
+ * 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 OpenSim 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 Mono.Addins;
+
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Text;
+using System.Net;
+using System.Net.Sockets;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
+{
+    public class JsonStore
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private OSD m_ValueStore;
+
+        protected class TakeValueCallbackClass
+        {
+            public string Path { get; set; }
+            public bool UseJson { get; set; }
+            public TakeValueCallback Callback { get; set; }
+
+            public TakeValueCallbackClass(string spath, bool usejson, TakeValueCallback cback)
+            {
+                Path = spath;
+                UseJson = usejson;
+                Callback = cback;
+            }
+        }
+
+        protected List<TakeValueCallbackClass> m_TakeStore;
+        protected List<TakeValueCallbackClass> m_ReadStore;
+        
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public JsonStore() : this("") {}
+        
+        public JsonStore(string value)
+        {
+            m_TakeStore = new List<TakeValueCallbackClass>();
+            m_ReadStore = new List<TakeValueCallbackClass>();
+           
+            if (String.IsNullOrEmpty(value))
+                m_ValueStore = new OSDMap();
+            else
+                m_ValueStore = OSDParser.DeserializeJson(value);
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool TestPath(string expr, bool useJson)
+        {
+            Stack<string> path = ParsePathExpression(expr);
+            OSD result = ProcessPathExpression(m_ValueStore,path);
+
+            if (result == null)
+                return false;
+            
+            if (useJson || result.Type == OSDType.String)
+                return true;
+            
+            return false;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool GetValue(string expr, out string value, bool useJson)
+        {
+            Stack<string> path = ParsePathExpression(expr);
+            OSD result = ProcessPathExpression(m_ValueStore,path);
+            return ConvertOutputValue(result,out value,useJson); 
+        }
+     
+                
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool RemoveValue(string expr)
+        {
+            return SetValueFromExpression(expr,null);
+        }
+       
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool SetValue(string expr, string value, bool useJson)
+        {
+            OSD ovalue = useJson ? OSDParser.DeserializeJson(value) :  new OSDString(value);
+            return SetValueFromExpression(expr,ovalue);
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool TakeValue(string expr, bool useJson, TakeValueCallback cback)
+        {
+            Stack<string> path = ParsePathExpression(expr);
+            string pexpr = PathExpressionToKey(path);
+
+            OSD result = ProcessPathExpression(m_ValueStore,path);
+            if (result == null)
+            {
+                m_TakeStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
+                return false;
+            }
+            
+            string value = String.Empty;
+            if (! ConvertOutputValue(result,out value,useJson))
+            {
+                // the structure does not match the request so i guess we'll wait
+                m_TakeStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
+                return false;
+            }
+
+            SetValueFromExpression(expr,null);
+            cback(value);
+
+            return true;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool ReadValue(string expr, bool useJson, TakeValueCallback cback)
+        {
+            Stack<string> path = ParsePathExpression(expr);
+            string pexpr = PathExpressionToKey(path);
+
+            OSD result = ProcessPathExpression(m_ValueStore,path);
+            if (result == null)
+            {
+                m_ReadStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
+                return false;
+            }
+            
+            string value = String.Empty;
+            if (! ConvertOutputValue(result,out value,useJson))
+            {
+                // the structure does not match the request so i guess we'll wait
+                m_ReadStore.Add(new TakeValueCallbackClass(pexpr,useJson,cback));
+                return false;
+            }
+
+            cback(value);
+
+            return true;
+        }
+     
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected bool SetValueFromExpression(string expr, OSD ovalue)
+        {
+            Stack<string> path = ParsePathExpression(expr);
+            if (path.Count == 0)
+            {
+                m_ValueStore = ovalue;
+                return true;
+            }
+
+            string pkey = path.Pop();
+            string pexpr = PathExpressionToKey(path);
+            if (pexpr != "")
+                pexpr += ".";
+
+            OSD result = ProcessPathExpression(m_ValueStore,path);
+            if (result == null)
+                return false;
+
+            Regex aPattern = new Regex("\\[([0-9]+|\\+)\\]");
+            MatchCollection amatches = aPattern.Matches(pkey,0);
+            
+            if (amatches.Count > 0)
+            {
+                if (result.Type != OSDType.Array)
+                    return false;
+
+                OSDArray amap = result as OSDArray;
+
+                Match match = amatches[0];
+                GroupCollection groups = match.Groups;
+                string akey = groups[1].Value;
+
+                if (akey == "+")
+                {
+                    string npkey = String.Format("[{0}]",amap.Count);
+
+                    amap.Add(ovalue);
+                    InvokeNextCallback(pexpr + npkey);
+                    return true;
+                }
+
+                int aval = Convert.ToInt32(akey);
+                if (0 <= aval && aval < amap.Count)
+                {
+                    if (ovalue == null)
+                        amap.RemoveAt(aval);
+                    else
+                    {
+                        amap[aval] = ovalue;
+                        InvokeNextCallback(pexpr + pkey);
+                    }
+                    return true;
+                }
+
+                return false;
+            }
+
+            Regex hPattern = new Regex("{([^}]+)}");
+            MatchCollection hmatches = hPattern.Matches(pkey,0);
+            
+            if (hmatches.Count > 0)
+            {
+                Match match = hmatches[0];
+                GroupCollection groups = match.Groups;
+                string hkey = groups[1].Value;
+                
+                if (result is OSDMap)
+                {
+                    OSDMap hmap = result as OSDMap;
+                    if (ovalue != null)
+                    {
+                        hmap[hkey] = ovalue;
+                        InvokeNextCallback(pexpr + pkey);
+                    }
+                    else if (hmap.ContainsKey(hkey))
+                        hmap.Remove(hkey);
+                    
+                    return true;
+                }
+
+                return false;
+            }
+
+            // Shouldn't get here if the path was checked correctly
+            m_log.WarnFormat("[JsonStore] invalid path expression");
+            return false;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected bool InvokeNextCallback(string pexpr)
+        {
+            // Process all of the reads that match the expression first
+            List<TakeValueCallbackClass> reads = 
+                m_ReadStore.FindAll(delegate(TakeValueCallbackClass tb) { return pexpr.StartsWith(tb.Path); });
+
+            foreach (TakeValueCallbackClass readcb in reads)
+            {
+                m_ReadStore.Remove(readcb);
+                ReadValue(readcb.Path,readcb.UseJson,readcb.Callback);
+            }
+
+            // Process one take next
+            TakeValueCallbackClass takecb =
+                m_TakeStore.Find(delegate(TakeValueCallbackClass tb) { return pexpr.StartsWith(tb.Path); });
+                                                               
+            if (takecb != null)
+            {
+                m_TakeStore.Remove(takecb);
+                TakeValue(takecb.Path,takecb.UseJson,takecb.Callback);
+
+                return true;
+            }
+
+            return false;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Parse the path expression and put the components into a stack. We
+        /// use a stack because we process the path in inverse order later
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected static Stack<string> ParsePathExpression(string path)
+        {
+            Stack<string> m_path = new Stack<string>();
+
+            // add front and rear separators
+            path = "." + path + ".";
+            
+            // add separators for quoted paths
+            Regex pass1 = new Regex("{[^}]+}");
+            path = pass1.Replace(path,".$0.",-1,0);
+                
+            // add separators for array references
+            Regex pass2 = new Regex("(\\[[0-9]+\\]|\\[\\+\\])");
+            path = pass2.Replace(path,".$0.",-1,0);
+                
+            // add quotes to bare identifier
+            Regex pass3 = new Regex("\\.([a-zA-Z]+)");
+            path = pass3.Replace(path,".{$1}",-1,0);
+                
+            // remove extra separators
+            Regex pass4 = new Regex("\\.+");
+            path = pass4.Replace(path,".",-1,0);
+
+            Regex validate = new Regex("^\\.(({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])\\.)+$");
+            if (validate.IsMatch(path))
+            {
+                Regex parser = new Regex("\\.({[^}]+}|\\[[0-9]+\\]|\\[\\+\\]+)");
+                MatchCollection matches = parser.Matches(path,0);
+                foreach (Match match in matches)
+                    m_path.Push(match.Groups[1].Value);
+            }
+
+            return m_path;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param>path is a stack where the top level of the path is at the bottom of the stack</param>
+        // -----------------------------------------------------------------
+        protected static OSD ProcessPathExpression(OSD map, Stack<string> path)
+        {
+            if (path.Count == 0)
+                return map;
+            
+            string pkey = path.Pop();
+
+            OSD rmap = ProcessPathExpression(map,path);
+            if (rmap == null)
+                return null;
+            
+            // ---------- Check for an array index ----------
+            Regex aPattern = new Regex("\\[([0-9]+)\\]");
+            MatchCollection amatches = aPattern.Matches(pkey,0);
+            
+            if (amatches.Count > 0)
+            {
+                if (rmap.Type != OSDType.Array)
+                {
+                    m_log.WarnFormat("[JsonStore] wrong type for key {2}, expecting {0}, got {1}",OSDType.Array,rmap.Type,pkey);
+                    return null;
+                }
+
+                OSDArray amap = rmap as OSDArray;
+
+                Match match = amatches[0];
+                GroupCollection groups = match.Groups;
+                string akey = groups[1].Value;
+                int aval = Convert.ToInt32(akey);
+                
+                if (aval < amap.Count)
+                    return (OSD) amap[aval];
+
+                return null;
+            }
+
+            // ---------- Check for a hash index ----------
+            Regex hPattern = new Regex("{([^}]+)}");
+            MatchCollection hmatches = hPattern.Matches(pkey,0);
+            
+            if (hmatches.Count > 0)
+            {
+                if (rmap.Type != OSDType.Map)
+                {
+                    m_log.WarnFormat("[JsonStore] wrong type for key {2}, expecting {0}, got {1}",OSDType.Map,rmap.Type,pkey);
+                    return null;
+                }
+                
+                OSDMap hmap = rmap as OSDMap;
+
+                Match match = hmatches[0];
+                GroupCollection groups = match.Groups;
+                string hkey = groups[1].Value;
+                
+                if (hmap.ContainsKey(hkey))
+                    return (OSD) hmap[hkey];
+
+                return null;
+            }
+
+            // Shouldn't get here if the path was checked correctly
+            m_log.WarnFormat("[JsonStore] Path type (unknown) does not match the structure");
+            return null;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected static bool ConvertOutputValue(OSD result, out string value, bool useJson)
+        {
+            value = String.Empty;
+            
+            // If we couldn't process the path
+            if (result == null)
+                return false;
+
+            if (useJson)
+            {
+                // The path pointed to an intermediate hash structure
+                if (result.Type == OSDType.Map)
+                {
+                    value = OSDParser.SerializeJsonString(result as OSDMap);
+                    return true;
+                }
+
+                // The path pointed to an intermediate hash structure
+                if (result.Type == OSDType.Array)
+                {
+                    value = OSDParser.SerializeJsonString(result as OSDArray);
+                    return true;
+                }
+
+                value = "'" + result.AsString() + "'"; 
+                return true;
+            }
+
+            if (result.Type == OSDType.String)
+            {
+                value = result.AsString(); 
+                return true;
+            }
+
+            return false;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected static string PathExpressionToKey(Stack<string> path)
+        {
+            if (path.Count == 0)
+                return "";
+                
+            string pkey = "";
+            foreach (string k in path)
+                pkey = (pkey == "") ? k : (k + "." + pkey);
+            
+            return pkey;
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
new file mode 100644
index 0000000..311531c
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -0,0 +1,430 @@
+/*
+ * Copyright (c) Contributors 
+ * 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 OpenSim 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 Mono.Addins;
+
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Text;
+using System.Net;
+using System.Net.Sockets;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+            
+namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "JsonStoreModule")]
+
+    public class JsonStoreModule  : INonSharedRegionModule, IJsonStoreModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfig m_config = null;
+        private bool m_enabled = false;
+        private Scene m_scene = null;
+
+        private Dictionary<UUID,JsonStore> m_JsonValueStore;
+        private UUID m_sharedStore;
+
+#region IRegionModule Members
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Name of this shared module is it's class name
+        /// </summary>
+        // -----------------------------------------------------------------
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Initialise this shared module
+        /// </summary>
+        /// <param name="scene">this region is getting initialised</param>
+        /// <param name="source">nini config, we are not using this</param>
+        // -----------------------------------------------------------------
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                if ((m_config = config.Configs["JsonStore"]) == null)
+                {
+                    // There is no configuration, the module is disabled
+                    // m_log.InfoFormat("[JsonStore] no configuration info");
+                    return;
+                }
+
+                m_enabled = m_config.GetBoolean("Enabled", m_enabled);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[JsonStore] initialization error: {0}",e.Message);
+                return;
+            }
+
+            if (m_enabled)
+                m_log.DebugFormat("[JsonStore] module is enabled");
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// everything is loaded, perform post load configuration
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void PostInitialise()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Nothing to do on close
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void Close()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
+            {
+                m_scene = scene;
+                m_scene.RegisterModuleInterface<IJsonStoreModule>(this);
+
+                m_sharedStore = UUID.Zero;
+                m_JsonValueStore = new Dictionary<UUID,JsonStore>();
+                m_JsonValueStore.Add(m_sharedStore,new JsonStore(""));
+            }
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RemoveRegion(Scene scene)
+        {
+            // need to remove all references to the scene in the subscription
+            // list to enable full garbage collection of the scene object
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Called when all modules have been added for a region. This is 
+        /// where we hook up events
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_enabled) {}
+        }
+
+        /// -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+#endregion
+
+#region ScriptInvocationInteface
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool CreateStore(string value, out UUID result)
+        {
+            result = UUID.Zero;
+            
+            if (! m_enabled) return false;
+            
+            UUID uuid = UUID.Random();
+            JsonStore map = null;
+
+            try
+            { 
+                map = new JsonStore(value);
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] Unable to initialize store from {0}; {1}",value,e.Message);
+                return false;
+            }
+
+            lock (m_JsonValueStore)
+                m_JsonValueStore.Add(uuid,map);
+            
+            result = uuid;
+            return true;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool DestroyStore(UUID storeID)
+        {
+            if (! m_enabled) return false;
+
+            lock (m_JsonValueStore)
+                m_JsonValueStore.Remove(storeID);
+            
+            return true;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool TestPath(UUID storeID, string path, bool useJson)
+        {
+            if (! m_enabled) return false;
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                {
+                    m_log.InfoFormat("[JsonStore] Missing store {0}",storeID);
+                    return true;
+                }
+            }
+            
+            try
+            {
+                lock (map)
+                    return map.TestPath(path,useJson);
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] Path test failed for {0} in {1}; {2}",path,storeID,e.Message);
+            }
+
+            return false;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool SetValue(UUID storeID, string path, string value, bool useJson)
+        {
+            if (! m_enabled) return false;
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                {
+                    m_log.InfoFormat("[JsonStore] Missing store {0}",storeID);
+                    return false;
+                }
+            }
+            
+            try
+            {
+                lock (map)
+                    if (map.SetValue(path,value,useJson))
+                        return true;
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] Unable to assign {0} to {1} in {2}; {3}",value,path,storeID,e.Message);
+            }
+
+            return false;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool RemoveValue(UUID storeID, string path)
+        {
+            if (! m_enabled) return false;
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                {
+                    m_log.InfoFormat("[JsonStore] Missing store {0}",storeID);
+                    return false;
+                }
+            }
+            
+            try
+            {
+                lock (map)
+                    if (map.RemoveValue(path))
+                        return true;
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] Unable to remove {0} in {1}; {2}",path,storeID,e.Message);
+            }
+
+            return false;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public bool GetValue(UUID storeID, string path, bool useJson, out string value)
+        {
+            value = String.Empty;
+            
+            if (! m_enabled) return false;
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                    return false;
+            }
+
+            try
+            {
+                lock (map)
+                {
+                    return map.GetValue(path, out value, useJson);
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.Message);
+            }
+            
+            return false;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback)
+        {
+            if (! m_enabled)
+            {
+                cback(String.Empty);
+                return;
+            }
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                {
+                    cback(String.Empty);
+                    return;
+                }
+            }
+
+            try
+            {
+                lock (map)
+                {
+                    map.TakeValue(path, useJson, cback);
+                    return;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString());
+            }
+            
+            cback(String.Empty);
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback)
+        {
+            if (! m_enabled)
+            {
+                cback(String.Empty);
+                return;
+            }
+
+            JsonStore map = null;
+            lock (m_JsonValueStore)
+            {
+                if (! m_JsonValueStore.TryGetValue(storeID,out map))
+                {
+                    cback(String.Empty);
+                    return;
+                }
+            }
+
+            try
+            {
+                lock (map)
+                {
+                    map.ReadValue(path, useJson, cback);
+                    return;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString());
+            }
+            
+            cback(String.Empty);
+        }
+
+#endregion
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
new file mode 100644
index 0000000..4949097
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) Contributors 
+ * 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 OpenSim 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 Mono.Addins;
+
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Text;
+using System.Net;
+using System.Net.Sockets;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "JsonStoreScriptModule")]
+
+    public class JsonStoreScriptModule  : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfig m_config = null;
+        private bool m_enabled = false;
+        private Scene m_scene = null;
+
+        private IScriptModuleComms m_comms;
+        private IJsonStoreModule m_store;
+        
+#region IRegionModule Members
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Name of this shared module is it's class name
+        /// </summary>
+        // -----------------------------------------------------------------
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Initialise this shared module
+        /// </summary>
+        /// <param name="scene">this region is getting initialised</param>
+        /// <param name="source">nini config, we are not using this</param>
+        // -----------------------------------------------------------------
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                if ((m_config = config.Configs["JsonStore"]) == null)
+                {
+                    // There is no configuration, the module is disabled
+                    // m_log.InfoFormat("[JsonStoreScripts] no configuration info");
+                    return;
+                }
+
+                m_enabled = m_config.GetBoolean("Enabled", m_enabled);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[JsonStoreScripts] initialization error: {0}",e.Message);
+                return;
+            }
+
+            if (m_enabled)
+                m_log.DebugFormat("[JsonStoreScripts] module is enabled");
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// everything is loaded, perform post load configuration
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void PostInitialise()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Nothing to do on close
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void Close()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void AddRegion(Scene scene)
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RemoveRegion(Scene scene)
+        {
+            // need to remove all references to the scene in the subscription
+            // list to enable full garbage collection of the scene object
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Called when all modules have been added for a region. This is 
+        /// where we hook up events
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_enabled)
+            {
+                m_scene = scene;
+                m_comms = m_scene.RequestModuleInterface<IScriptModuleComms>();
+                if (m_comms == null)
+                {
+                    m_log.ErrorFormat("[JsonStoreScripts] ScriptModuleComms interface not defined");
+                    m_enabled = false;
+                    return;
+                }
+
+                m_store = m_scene.RequestModuleInterface<IJsonStoreModule>();
+                if (m_store == null)
+                {
+                    m_log.ErrorFormat("[JsonStoreScripts] JsonModule interface not defined");
+                    m_enabled = false;
+                    return;
+                }
+                    
+                try
+                {
+                    m_comms.RegisterScriptInvocation(this,"JsonCreateStore");
+                    m_comms.RegisterScriptInvocation(this,"JsonDestroyStore");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonReadNotecard");
+                    m_comms.RegisterScriptInvocation(this,"JsonWriteNotecard");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonTestPath");
+                    m_comms.RegisterScriptInvocation(this,"JsonTestPathJson");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonGetValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonGetValueJson");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonTakeValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonTakeValueJson");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonReadValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonReadValueJson");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonSetValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonSetValueJson");
+
+                    m_comms.RegisterScriptInvocation(this,"JsonRemoveValue");
+                }
+                catch (Exception e)
+                {
+                    // See http://opensimulator.org/mantis/view.php?id=5971 for more information
+                    m_log.WarnFormat("[JsonStroreScripts] script method registration failed; {0}",e.Message);
+                    m_enabled = false;
+                }
+            }
+        }
+
+        /// -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+#endregion
+
+#region ScriptInvocationInteface
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected void GenerateRuntimeError(string msg)
+        {
+            throw new Exception("JsonStore Runtime Error: " + msg);
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected UUID JsonCreateStore(UUID hostID, UUID scriptID, string value)
+        {
+            UUID uuid = UUID.Zero;
+            if (! m_store.CreateStore(value, out uuid))
+                GenerateRuntimeError("Failed to create Json store");
+            
+            return uuid;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected int JsonDestroyStore(UUID hostID, UUID scriptID, UUID storeID)
+        {
+            return m_store.DestroyStore(storeID) ? 1 : 0;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected UUID JsonReadNotecard(UUID hostID, UUID scriptID, UUID storeID, string path, UUID assetID)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonReadNotecard(reqID,hostID,scriptID,storeID,path,assetID); });
+            return reqID;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected UUID JsonWriteNotecard(UUID hostID, UUID scriptID, UUID storeID, string path, string name)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonWriteNotecard(reqID,hostID,scriptID,storeID,path,name); });
+            return reqID;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected int JsonTestPath(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            return m_store.TestPath(storeID,path,false) ? 1 : 0;
+        }
+
+        protected int JsonTestPathJson(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            return m_store.TestPath(storeID,path,true) ? 1 : 0;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected int JsonSetValue(UUID hostID, UUID scriptID, UUID storeID, string path, string value)
+        {
+            return m_store.SetValue(storeID,path,value,false) ? 1 : 0;
+        }
+
+        protected int JsonSetValueJson(UUID hostID, UUID scriptID, UUID storeID, string path, string value)
+        {
+            return m_store.SetValue(storeID,path,value,true) ? 1 : 0;
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected int JsonRemoveValue(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            return m_store.RemoveValue(storeID,path) ? 1 : 0;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected string JsonGetValue(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            string value = String.Empty;
+            m_store.GetValue(storeID,path,false,out value);
+            return value;
+        }
+
+        protected string JsonGetValueJson(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            string value = String.Empty;
+            m_store.GetValue(storeID,path,true, out value);
+            return value;
+        }
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected UUID JsonTakeValue(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonTakeValue(scriptID,reqID,storeID,path,false); });
+            return reqID;
+        }
+
+        protected UUID JsonTakeValueJson(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonTakeValue(scriptID,reqID,storeID,path,true); });
+            return reqID;
+        }
+        
+        private void DoJsonTakeValue(UUID scriptID, UUID reqID, UUID storeID, string path, bool useJson)
+        {
+            try
+            {
+                m_store.TakeValue(storeID,path,useJson,delegate(string value) { DispatchValue(scriptID,reqID,value); });
+                return;
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStoreScripts] unable to retrieve value; {0}",e.ToString());
+            }
+            
+            DispatchValue(scriptID,reqID,String.Empty);
+        }
+
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected UUID JsonReadValue(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonReadValue(scriptID,reqID,storeID,path,false); });
+            return reqID;
+        }
+
+        protected UUID JsonReadValueJson(UUID hostID, UUID scriptID, UUID storeID, string path)
+        {
+            UUID reqID = UUID.Random();
+            Util.FireAndForget(delegate(object o) { DoJsonReadValue(scriptID,reqID,storeID,path,true); });
+            return reqID;
+        }
+        
+        private void DoJsonReadValue(UUID scriptID, UUID reqID, UUID storeID, string path, bool useJson)
+        {
+            try
+            {
+                m_store.ReadValue(storeID,path,useJson,delegate(string value) { DispatchValue(scriptID,reqID,value); });
+                return;
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[JsonStoreScripts] unable to retrieve value; {0}",e.ToString());
+            }
+            
+            DispatchValue(scriptID,reqID,String.Empty);
+        }
+
+#endregion
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        protected void DispatchValue(UUID scriptID, UUID reqID, string value)
+        {
+            m_comms.DispatchReply(scriptID,1,value,reqID.ToString());
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        private void DoJsonReadNotecard(UUID reqID, UUID hostID, UUID scriptID, UUID storeID, string path, UUID assetID)
+        {
+            AssetBase a = m_scene.AssetService.Get(assetID.ToString());
+            if (a == null)
+                GenerateRuntimeError(String.Format("Unable to find notecard asset {0}",assetID));
+
+            if (a.Type != (sbyte)AssetType.Notecard)
+                GenerateRuntimeError(String.Format("Invalid notecard asset {0}",assetID));
+            
+            m_log.DebugFormat("[JsonStoreScripts] read notecard in context {0}",storeID);
+
+            try 
+            {
+                System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
+                string jsondata = SLUtil.ParseNotecardToString(enc.GetString(a.Data));
+                int result = m_store.SetValue(storeID,path,jsondata,true) ? 1 : 0;
+                m_comms.DispatchReply(scriptID,result,"",reqID.ToString());
+                return;
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[JsonStoreScripts] Json parsing failed; {0}",e.Message);
+            }
+
+            GenerateRuntimeError(String.Format("Json parsing failed for {0}",assetID.ToString()));
+            m_comms.DispatchReply(scriptID,0,"",reqID.ToString());
+        }
+            
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        private void DoJsonWriteNotecard(UUID reqID, UUID hostID, UUID scriptID, UUID storeID, string path, string name)
+        {
+            string data;
+            if (! m_store.GetValue(storeID,path,true, out data))
+            {
+                m_comms.DispatchReply(scriptID,0,UUID.Zero.ToString(),reqID.ToString());
+                return;
+            }
+                
+            SceneObjectPart host = m_scene.GetSceneObjectPart(hostID);
+            
+            // Create new asset
+            UUID assetID = UUID.Random();
+            AssetBase asset = new AssetBase(assetID, name, (sbyte)AssetType.Notecard, host.OwnerID.ToString());
+            asset.Description = "Json store";
+
+            int textLength = data.Length;
+            data = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
+                    + textLength.ToString() + "\n" + data + "}\n";
+
+            asset.Data = Util.UTF8.GetBytes(data);
+            m_scene.AssetService.Store(asset);
+
+            // Create Task Entry
+            TaskInventoryItem taskItem = new TaskInventoryItem();
+
+            taskItem.ResetIDs(host.UUID);
+            taskItem.ParentID = host.UUID;
+            taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
+            taskItem.Name = asset.Name;
+            taskItem.Description = asset.Description;
+            taskItem.Type = (int)AssetType.Notecard;
+            taskItem.InvType = (int)InventoryType.Notecard;
+            taskItem.OwnerID = host.OwnerID;
+            taskItem.CreatorID = host.OwnerID;
+            taskItem.BasePermissions = (uint)PermissionMask.All;
+            taskItem.CurrentPermissions = (uint)PermissionMask.All;
+            taskItem.EveryonePermissions = 0;
+            taskItem.NextPermissions = (uint)PermissionMask.All;
+            taskItem.GroupID = host.GroupID;
+            taskItem.GroupPermissions = 0;
+            taskItem.Flags = 0;
+            taskItem.PermsGranter = UUID.Zero;
+            taskItem.PermsMask = 0;
+            taskItem.AssetID = asset.FullID;
+
+            host.Inventory.AddInventoryItem(taskItem, false);
+
+            m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString());
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 922eaaf..d192309 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public Vector3 WorldPosition
         {
             get { return GetSP().AbsolutePosition; }
-            set { GetSP().TeleportWithMomentum(value); }
+            set { GetSP().Teleport(value); }
         }
         
         public bool IsChildAgent
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index cab30de..74a85e2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -38,7 +38,7 @@ using OpenMetaverse;
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
+namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
     class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 8996865..e798382 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -76,22 +76,27 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public void Say(string message)
         {
-            SendOnChatFromClient(message, ChatTypeEnum.Say);
+            SendOnChatFromClient(0, message, ChatTypeEnum.Say);
         }
 
-        public void Shout(string message)
+        public void Say(int channel, string message)
         {
-            SendOnChatFromClient(message, ChatTypeEnum.Shout);
+            SendOnChatFromClient(channel, message, ChatTypeEnum.Say);
         }
 
-        public void Whisper(string message)
+        public void Shout(int channel, string message)
         {
-            SendOnChatFromClient(message, ChatTypeEnum.Whisper);
+            SendOnChatFromClient(channel, message, ChatTypeEnum.Shout);
+        }
+
+        public void Whisper(int channel, string message)
+        {
+            SendOnChatFromClient(channel, message, ChatTypeEnum.Whisper);
         }
 
         public void Broadcast(string message)
         {
-            SendOnChatFromClient(message, ChatTypeEnum.Broadcast);
+            SendOnChatFromClient(0, message, ChatTypeEnum.Broadcast);
         }
 
         public void GiveMoney(UUID target, int amount)
@@ -146,10 +151,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         #region Internal Functions
 
-        private void SendOnChatFromClient(string message, ChatTypeEnum chatType)
+        private void SendOnChatFromClient(int channel, string message, ChatTypeEnum chatType)
         {
             OSChatMessage chatFromClient = new OSChatMessage();
-            chatFromClient.Channel = 0;
+            chatFromClient.Channel = channel;
             chatFromClient.From = Name;
             chatFromClient.Message = message;
             chatFromClient.Position = StartPos;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index ebf5e84..a32ab2a 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -155,18 +155,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
                     {
-                        m_log.DebugFormat(
-                            "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID);
-
                         sp.CompleteMovement(npcAvatar, false);
                         m_avatars.Add(npcAvatar.AgentId, npcAvatar);
+                        m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
                     }
-                    else
-                    {
-                        m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID);
-                        npcAvatar.AgentId = UUID.Zero;
-                    }
-
                 }
                 ev.Set();
             });
@@ -178,7 +170,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             return npcAvatar.AgentId;
         }
 
-        public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget)
+        public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget, bool running)
         {
             lock (m_avatars)
             {
@@ -192,6 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                         sp.Name, pos, scene.RegionInfo.RegionName, noFly, landAtTarget);
 
                     sp.MoveToTarget(pos, noFly, landAtTarget);
+                    sp.SetAlwaysRun = running;
 
                     return true;
                 }
@@ -221,6 +214,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public bool Say(UUID agentID, Scene scene, string text)
         {
+            return Say(agentID, scene, text, 0);
+        }
+
+        public bool Say(UUID agentID, Scene scene, string text, int channel)
+        {
             lock (m_avatars)
             {
                 if (m_avatars.ContainsKey(agentID))
@@ -228,7 +226,25 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     scene.TryGetScenePresence(agentID, out sp);
 
-                    m_avatars[agentID].Say(text);
+                    m_avatars[agentID].Say(channel, text);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool Shout(UUID agentID, Scene scene, string text, int channel)
+        {
+            lock (m_avatars)
+            {
+                if (m_avatars.ContainsKey(agentID))
+                {
+                    ScenePresence sp;
+                    scene.TryGetScenePresence(agentID, out sp);
+
+                    m_avatars[agentID].Shout(channel, text);
 
                     return true;
                 }
@@ -255,6 +271,24 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             return false;
         }
 
+        public bool Whisper(UUID agentID, Scene scene, string text, int channel)
+        {
+            lock (m_avatars)
+            {
+                if (m_avatars.ContainsKey(agentID))
+                {
+                    ScenePresence sp;
+                    scene.TryGetScenePresence(agentID, out sp);
+
+                    m_avatars[agentID].Whisper(channel, text);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public bool Stand(UUID agentID, Scene scene)
         {
             lock (m_avatars)
@@ -308,7 +342,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
 
-//                    m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name);
+                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
                     return true;
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index eea0b2e..65dad2d 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             m_attMod = new AttachmentsModule();
             m_npcMod = new NPCModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, m_afMod, m_umMod, m_attMod, m_npcMod, new BasicInventoryAccessModule());
         }
 
@@ -242,7 +242,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
 
             Vector3 targetPos = startPos + new Vector3(0, 10, 0);
-            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false);
+            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false, false);
 
             Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
             //Assert.That(npc.Rotation, Is.EqualTo(new Quaternion(0, 0, 0.7071068f, 0.7071068f)));
@@ -267,7 +267,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             // Try a second movement
             startPos = npc.AbsolutePosition;
             targetPos = startPos + new Vector3(10, 0, 0);
-            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false);
+            m_npcMod.MoveToTarget(npc.UUID, m_scene, targetPos, false, false, false);
 
             Assert.That(npc.AbsolutePosition, Is.EqualTo(startPos));
 //            Assert.That(npc.Rotation, Is.EqualTo(new Quaternion(0, 0, 0, 1)));
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index b1a3ff9..e43136a 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -36,13 +36,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 {
     public class BasicActor : PhysicsActor
     {
-        private Vector3 _position;
-        private Vector3 _velocity;
-        private Vector3 _acceleration;
         private Vector3 _size;
-        private Vector3 m_rotationalVelocity;
-        private bool flying;
-        private bool iscolliding;
 
         public BasicActor(Vector3 size)
         {
@@ -55,11 +49,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             set { return; }
         }
 
-        public override Vector3 RotationalVelocity
-        {
-            get { return m_rotationalVelocity; }
-            set { m_rotationalVelocity = value; }
-        }
+        public override Vector3 RotationalVelocity { get; set; }
 
         public override bool SetAlwaysRun
         {
@@ -105,17 +95,9 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             set { return; }
         }
 
-        public override bool Flying
-        {
-            get { return flying; }
-            set { flying = value; }
-        }
+        public override bool Flying { get; set; }
 
-        public override bool IsColliding
-        {
-            get { return iscolliding; }
-            set { iscolliding = value; }
-        }
+        public override bool IsColliding { get; set; }
 
         public override bool CollidingGround
         {
@@ -134,11 +116,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             get { return false; }
         }
 
-        public override Vector3 Position
-        {
-            get { return _position; }
-            set { _position = value; }
-        }
+        public override Vector3 Position { get; set; }
 
         public override Vector3 Size
         {
@@ -206,11 +184,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             get { return Vector3.Zero; }
         }
 
-        public override Vector3 Velocity
-        {
-            get { return _velocity; }
-            set { _velocity = value; }
-        }
+        public override Vector3 Velocity { get; set; }
 
         public override Vector3 Torque
         {
@@ -230,11 +204,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             set { }
         }
 
-        public override Vector3 Acceleration
-        {
-            get { return _acceleration; }
-            set { _acceleration = value; }
-        }
+        public override Vector3 Acceleration { get; set; }
 
         public override bool Kinematic
         {
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
new file mode 100644
index 0000000..b89eeed
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
@@ -0,0 +1,314 @@
+/*
+ * 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 Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+
+namespace OpenSim.Region.Physics.BasicPhysicsPlugin
+{
+    public class BasicPhysicsPrim : PhysicsActor
+    {
+        private Vector3 _size;
+        private PrimitiveBaseShape _shape;
+
+        public BasicPhysicsPrim(
+            string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape)
+        {
+            Name = name;
+            LocalID = localId;
+            Position = position;
+            Size = size;
+            Orientation = orientation;
+            Shape = shape;
+        }
+
+        public override int PhysicsActorType
+        {
+            get { return (int) ActorTypes.Agent; }
+            set { return; }
+        }
+
+        public override Vector3 RotationalVelocity { get; set; }
+
+        public override bool SetAlwaysRun
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override uint LocalID
+        {
+            set { return; }
+        }
+
+        public override bool Grabbed
+        {
+            set { return; }
+        }
+
+        public override bool Selected
+        {
+            set { return; }
+        }
+
+        public override float Buoyancy
+        {
+            get { return 0f; }
+            set { return; }
+        }
+
+        public override bool FloatOnWater
+        {
+            set { return; }
+        }
+
+        public override bool IsPhysical
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool ThrottleUpdates
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool Flying { get; set; }
+
+        public override bool IsColliding { get; set; }
+
+        public override bool CollidingGround
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool CollidingObj
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool Stopped
+        {
+            get { return false; }
+        }
+
+        public override Vector3 Position { get; set; }
+
+        public override Vector3 Size
+        {
+            get { return _size; }
+            set {
+                  _size = value;
+                  _size.Z = _size.Z / 2.0f;
+                }
+        }
+
+        public override PrimitiveBaseShape Shape
+        {
+            set { _shape = value; }
+        }
+
+        public override float Mass
+        {
+            get { return 0f; }
+        }
+
+        public override Vector3 Force
+        {
+            get { return Vector3.Zero; }
+            set { return; }
+        }
+
+        public override int VehicleType
+        {
+            get { return 0; }
+            set { return; }
+        }
+
+        public override void VehicleFloatParam(int param, float value)
+        {
+
+        }
+
+        public override void VehicleVectorParam(int param, Vector3 value)
+        {
+
+        }
+
+        public override void VehicleRotationParam(int param, Quaternion rotation)
+        {
+
+        }
+
+        public override void VehicleFlags(int param, bool remove)
+        {
+
+        }
+
+        public override void SetVolumeDetect(int param)
+        {
+
+        }
+
+        public override Vector3 CenterOfMass
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override Vector3 GeometricCenter
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override Vector3 Velocity { get; set; }
+
+        public override Vector3 Torque
+        {
+            get { return Vector3.Zero; }
+            set { return; }
+        }
+
+        public override float CollisionScore
+        {
+            get { return 0f; }
+            set { }
+        }
+
+        public override Quaternion Orientation { get; set; }
+
+        public override Vector3 Acceleration { get; set; }
+
+        public override bool Kinematic
+        {
+            get { return true; }
+            set { }
+        }
+
+        public override void link(PhysicsActor obj)
+        {
+        }
+
+        public override void delink()
+        {
+        }
+
+        public override void LockAngularMotion(Vector3 axis)
+        {
+        }
+
+        public override void AddForce(Vector3 force, bool pushforce)
+        {
+        }
+
+        public override void AddAngularForce(Vector3 force, bool pushforce)
+        {
+        }
+
+        public override void SetMomentum(Vector3 momentum)
+        {
+        }
+
+        public override void CrossingFailure()
+        {
+        }
+
+        public override Vector3 PIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool PIDActive
+        {
+            set { return; }
+        }
+
+        public override float PIDTau
+        {
+            set { return; }
+        }
+
+        public override float PIDHoverHeight
+        {
+            set { return; }
+        }
+
+        public override bool PIDHoverActive
+        {
+            set { return; }
+        }
+
+        public override PIDHoverType PIDHoverType
+        {
+            set { return; }
+        }
+
+        public override float PIDHoverTau
+        {
+            set { return; }
+        }
+
+        public override Quaternion APIDTarget 
+        { 
+            set { return; }
+        }
+        
+        public override bool APIDActive
+        { 
+            set { return; }
+        }
+        
+        public override float APIDStrength
+        { 
+            set { return; }
+        }
+        
+        public override float APIDDamping
+        { 
+            set { return; }
+        }
+
+        public override void SubscribeEvents(int ms)
+        {
+        }
+
+        public override void UnSubscribeEvents()
+        {
+        }
+
+        public override bool SubscribedEvents()
+        {
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
index 2e14216..f5826ed 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
@@ -34,9 +34,17 @@ using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 {
+    /// <summary>
+    /// This is an incomplete extremely basic physics implementation
+    /// </summary>
+    /// <remarks>
+    /// Not useful for anything at the moment apart from some regression testing in other components where some form
+    /// of physics plugin is needed.
+    /// </remarks>
     public class BasicScene : PhysicsScene
     {
         private List<BasicActor> _actors = new List<BasicActor>();
+        private List<BasicPhysicsPrim> _prims = new List<BasicPhysicsPrim>();
         private float[] _heightMap;
 
         //protected internal string sceneIdentifier;
@@ -50,10 +58,19 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
         }
 
-        public override void Dispose()
+        public override void Dispose() {}
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
         {
+            BasicPhysicsPrim prim = new BasicPhysicsPrim(primName, localid, position, size, rotation, pbs);
+            prim.IsPhysical = isPhysical;
+
+            _prims.Add(prim);
 
+            return prim;
         }
+
         public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
         {
             BasicActor act = new BasicActor(size);
@@ -63,30 +80,18 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             return act;
         }
 
-        public override void RemovePrim(PhysicsActor prim)
+        public override void RemovePrim(PhysicsActor actor)
         {
+            BasicPhysicsPrim prim = (BasicPhysicsPrim)actor;
+            if (_prims.Contains(prim))
+                _prims.Remove(prim);
         }
 
         public override void RemoveAvatar(PhysicsActor actor)
         {
-            BasicActor act = (BasicActor) actor;
+            BasicActor act = (BasicActor)actor;
             if (_actors.Contains(act))
-            {
                 _actors.Remove(act);
-            }
-        }
-
-/*
-        public override PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation)
-        {
-            return null;
-        }
-*/
-
-        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
-        {
-            return null;
         }
 
         public override void AddPhysicsActorTaint(PhysicsActor prim)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 6f37347..a41c856 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -156,7 +156,15 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// </summary>
         public IntPtr m_targetSpace = IntPtr.Zero;
 
+        /// <summary>
+        /// The prim geometry, used for collision detection.
+        /// </summary>
+        /// <remarks>
+        /// This is never null except for a brief period when the geometry needs to be replaced (due to resizing or
+        /// mesh change) or when the physical prim is being removed from the scene.
+        /// </remarks>
         public IntPtr prim_geom { get; private set; }
+
         public IntPtr _triMeshData { get; private set; }
 
         private IntPtr _linkJointGroup = IntPtr.Zero;
@@ -325,14 +333,12 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             prim_geom = geom;
 //Console.WriteLine("SetGeom to " + prim_geom + " for " + Name);
-            if (prim_geom != IntPtr.Zero)
-            {
-                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
-                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
-                _parent_scene.geom_name_map[prim_geom] = Name;
-                _parent_scene.actor_name_map[prim_geom] = this;
-            }
+            d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+            d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+
+            _parent_scene.geom_name_map[prim_geom] = Name;
+            _parent_scene.actor_name_map[prim_geom] = this;
 
             if (childPrim)
             {
@@ -765,11 +771,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                         m_collisionCategories &= ~CollisionCategories.Body;
                         m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
 
-                        if (prim_geom != IntPtr.Zero)
-                        {
-                            d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
-                            d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
-                        }
+                        d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                        d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
                         d.BodyDestroy(Body);
                         lock (childrenPrim)
@@ -793,11 +796,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_collisionCategories &= ~CollisionCategories.Body;
                     m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
 
-                    if (prim_geom != IntPtr.Zero)
-                    {
-                        d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
-                        d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
-                    }
+                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
                     Body = IntPtr.Zero;
                 }
@@ -864,10 +864,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 //            _parent_scene.waitForSpaceUnlock(m_targetSpace);
             try
             {
-                if (prim_geom == IntPtr.Zero)
-                {
-                    SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
-                }
+                SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
             }
             catch (AccessViolationException)
             {
@@ -890,73 +887,67 @@ namespace OpenSim.Region.Physics.OdePlugin
 #if SPAM
 Console.WriteLine("ZProcessTaints for " + Name);
 #endif
+
+            // This must be processed as the very first taint so that later operations have a prim_geom to work with
+            // if this is a new prim.
             if (m_taintadd)
-            {
                 changeadd();
-            }
-            
-            if (prim_geom != IntPtr.Zero)
-            {
-                 if (!_position.ApproxEquals(m_taintposition, 0f))
-                     changemove();
 
-                 if (m_taintrot != _orientation)
-                 {
-                    if (childPrim && IsPhysical)    // For physical child prim...
-                    {
-                        rotate();
-                        // KF: ODE will also rotate the parent prim!
-                        // so rotate the root back to where it was
-                        OdePrim parent = (OdePrim)_parent;
-                        parent.rotate();
-                    }
-                    else
-                    {
-                        //Just rotate the prim
-                        rotate();
-                    }
+            if (!_position.ApproxEquals(m_taintposition, 0f))
+                 changemove();
+
+            if (m_taintrot != _orientation)
+            {
+                if (childPrim && IsPhysical)    // For physical child prim...
+                {
+                    rotate();
+                    // KF: ODE will also rotate the parent prim!
+                    // so rotate the root back to where it was
+                    OdePrim parent = (OdePrim)_parent;
+                    parent.rotate();
                 }
-            
-                if (m_taintPhysics != IsPhysical && !(m_taintparent != _parent))
-                    changePhysicsStatus();
+                else
+                {
+                    //Just rotate the prim
+                    rotate();
+                }
+            }
+        
+            if (m_taintPhysics != IsPhysical && !(m_taintparent != _parent))
+                changePhysicsStatus();
 
-                if (!_size.ApproxEquals(m_taintsize, 0f))
-                    changesize();
+            if (!_size.ApproxEquals(m_taintsize, 0f))
+                changesize();
 
-                if (m_taintshape)
-                    changeshape();
+            if (m_taintshape)
+                changeshape();
 
-                if (m_taintforce)
-                    changeAddForce();
+            if (m_taintforce)
+                changeAddForce();
 
-                if (m_taintaddangularforce)
-                    changeAddAngularForce();
+            if (m_taintaddangularforce)
+                changeAddAngularForce();
 
-                if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
-                    changeSetTorque();
+            if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
+                changeSetTorque();
 
-                if (m_taintdisable)
-                    changedisable();
+            if (m_taintdisable)
+                changedisable();
 
-                if (m_taintselected != m_isSelected)
-                    changeSelectedStatus();
+            if (m_taintselected != m_isSelected)
+                changeSelectedStatus();
 
-                if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
-                    changevelocity();
+            if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
+                changevelocity();
 
-                if (m_taintparent != _parent)
-                    changelink();
+            if (m_taintparent != _parent)
+                changelink();
 
-                if (m_taintCollidesWater != m_collidesWater)
-                    changefloatonwater();
+            if (m_taintCollidesWater != m_collidesWater)
+                changefloatonwater();
 
-                if (!m_angularlock.ApproxEquals(m_taintAngularLock,0f))
-                    changeAngularLock();
-            }
-            else
-            {
-                m_log.ErrorFormat("[PHYSICS]: The scene reused a disposed PhysActor for {0}! *waves finger*, Don't be evil.  A couple of things can cause this.   An improper prim breakdown(be sure to set prim_geom to zero after d.GeomDestroy!   An improper buildup (creating the geom failed).   Or, the Scene Reused a physics actor after disposing it.)", Name);
-            }
+            if (!m_angularlock.ApproxEquals(m_taintAngularLock,0f))
+                changeAngularLock();
         }
 
         /// <summary>
@@ -1052,150 +1043,146 @@ Console.WriteLine("ZProcessTaints for " + Name);
         /// <param name="prim">Child prim</param>
         private void AddChildPrim(OdePrim prim)
         {
-//Console.WriteLine("AddChildPrim  " + Name);
-            if (LocalID != prim.LocalID)
+            if (LocalID == prim.LocalID)
+                return;
+
+            if (Body == IntPtr.Zero)
             {
-                if (Body == IntPtr.Zero)
+                Body = d.BodyCreate(_parent_scene.world);
+                setMass();
+            }
+
+            lock (childrenPrim)
+            {
+                if (childrenPrim.Contains(prim))
+                    return;
+
+//                m_log.DebugFormat(
+//                    "[ODE PRIM]: Linking prim {0} {1} to {2} {3}", prim.Name, prim.LocalID, Name, LocalID);
+
+                childrenPrim.Add(prim);
+
+                foreach (OdePrim prm in childrenPrim)
                 {
-                    Body = d.BodyCreate(_parent_scene.world);
-                    setMass();
+                    d.Mass m2;
+                    d.MassSetZero(out m2);
+                    d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
+
+                    d.Quaternion quat = new d.Quaternion();
+                    quat.W = prm._orientation.W;
+                    quat.X = prm._orientation.X;
+                    quat.Y = prm._orientation.Y;
+                    quat.Z = prm._orientation.Z;
+
+                    d.Matrix3 mat = new d.Matrix3();
+                    d.RfromQ(out mat, ref quat);
+                    d.MassRotate(ref m2, ref mat);
+                    d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z);
+                    d.MassAdd(ref pMass, ref m2);
                 }
-                if (Body != IntPtr.Zero)
+
+                foreach (OdePrim prm in childrenPrim)
                 {
-                    lock (childrenPrim)
-                    {
-                        if (!childrenPrim.Contains(prim))
-                        {
-//Console.WriteLine("childrenPrim.Add " + prim);
-                            childrenPrim.Add(prim);
-                            
-                            foreach (OdePrim prm in childrenPrim)
-                            {
-                                d.Mass m2;
-                                d.MassSetZero(out m2);
-                                d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
-
-                                d.Quaternion quat = new d.Quaternion();
-                                quat.W = prm._orientation.W;
-                                quat.X = prm._orientation.X;
-                                quat.Y = prm._orientation.Y;
-                                quat.Z = prm._orientation.Z;
-
-                                d.Matrix3 mat = new d.Matrix3();
-                                d.RfromQ(out mat, ref quat);
-                                d.MassRotate(ref m2, ref mat);
-                                d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z);
-                                d.MassAdd(ref pMass, ref m2);
-                            }
-                            
-                            foreach (OdePrim prm in childrenPrim)
-                            {
-                                prm.m_collisionCategories |= CollisionCategories.Body;
-                                prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
+                    prm.m_collisionCategories |= CollisionCategories.Body;
+                    prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
 
-                                if (prm.prim_geom == IntPtr.Zero)
-                                {
-                                    m_log.WarnFormat(
-                                        "[PHYSICS]: Unable to link one of the linkset elements {0} for parent {1}.  No geom yet", 
-                                        prm.Name, prim.Name);
-                                    continue;
-                                }
 //Console.WriteLine(" GeomSetCategoryBits 1: " + prm.prim_geom + " - " + (int)prm.m_collisionCategories + " for " + Name);
-                                d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
-                                d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
-
+                    d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
+                    d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
 
-                                d.Quaternion quat = new d.Quaternion();
-                                quat.W = prm._orientation.W;
-                                quat.X = prm._orientation.X;
-                                quat.Y = prm._orientation.Y;
-                                quat.Z = prm._orientation.Z;
+                    d.Quaternion quat = new d.Quaternion();
+                    quat.W = prm._orientation.W;
+                    quat.X = prm._orientation.X;
+                    quat.Y = prm._orientation.Y;
+                    quat.Z = prm._orientation.Z;
 
-                                d.Matrix3 mat = new d.Matrix3();
-                                d.RfromQ(out mat, ref quat);
-                                if (Body != IntPtr.Zero)
-                                {
-                                    d.GeomSetBody(prm.prim_geom, Body);
-                                    prm.childPrim = true;
-                                    d.GeomSetOffsetWorldPosition(prm.prim_geom, prm.Position.X , prm.Position.Y, prm.Position.Z);
-                                    //d.GeomSetOffsetPosition(prim.prim_geom,
-                                    //    (Position.X - prm.Position.X) - pMass.c.X,
-                                    //    (Position.Y - prm.Position.Y) - pMass.c.Y,
-                                    //    (Position.Z - prm.Position.Z) - pMass.c.Z);
-                                    d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat);
-                                    //d.GeomSetOffsetRotation(prm.prim_geom, ref mat);
-                                    d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
-                                    d.BodySetMass(Body, ref pMass);
-                                }
-                                else
-                                {
-                                    m_log.DebugFormat("[PHYSICS]: {0} ain't got no boooooooooddy, no body", Name);
-                                }
+                    d.Matrix3 mat = new d.Matrix3();
+                    d.RfromQ(out mat, ref quat);
+                    if (Body != IntPtr.Zero)
+                    {
+                        d.GeomSetBody(prm.prim_geom, Body);
+                        prm.childPrim = true;
+                        d.GeomSetOffsetWorldPosition(prm.prim_geom, prm.Position.X , prm.Position.Y, prm.Position.Z);
+                        //d.GeomSetOffsetPosition(prim.prim_geom,
+                        //    (Position.X - prm.Position.X) - pMass.c.X,
+                        //    (Position.Y - prm.Position.Y) - pMass.c.Y,
+                        //    (Position.Z - prm.Position.Z) - pMass.c.Z);
+                        d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat);
+                        //d.GeomSetOffsetRotation(prm.prim_geom, ref mat);
+                        d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
+                        d.BodySetMass(Body, ref pMass);
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[PHYSICS]: {0} ain't got no boooooooooddy, no body", Name);
+                    }
 
-                                prm.m_interpenetrationcount = 0;
-                                prm.m_collisionscore = 0;
-                                prm.m_disabled = false;
+                    prm.m_interpenetrationcount = 0;
+                    prm.m_collisionscore = 0;
+                    prm.m_disabled = false;
 
-                                // The body doesn't already have a finite rotation mode set here
-                                if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
-                                {
-                                    prm.createAMotor(m_angularlock);
-                                }
-                                prm.Body = Body;
-                                _parent_scene.ActivatePrim(prm);
-                            }
+                    // The body doesn't already have a finite rotation mode set here
+                    if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
+                    {
+                        prm.createAMotor(m_angularlock);
+                    }
+                    prm.Body = Body;
+                    _parent_scene.ActivatePrim(prm);
+                }
 
-                            m_collisionCategories |= CollisionCategories.Body;
-                            m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
+                m_collisionCategories |= CollisionCategories.Body;
+                m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
 
 //Console.WriteLine("GeomSetCategoryBits 2: " + prim_geom + " - " + (int)m_collisionCategories + " for " + Name);
-                            d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
 //Console.WriteLine(" Post GeomSetCategoryBits 2");
-                            d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
-
-                            d.Quaternion quat2 = new d.Quaternion();
-                            quat2.W = _orientation.W;
-                            quat2.X = _orientation.X;
-                            quat2.Y = _orientation.Y;
-                            quat2.Z = _orientation.Z;
-
-                            d.Matrix3 mat2 = new d.Matrix3();
-                            d.RfromQ(out mat2, ref quat2);
-                            d.GeomSetBody(prim_geom, Body);
-                            d.GeomSetOffsetWorldPosition(prim_geom, Position.X - pMass.c.X, Position.Y - pMass.c.Y, Position.Z - pMass.c.Z);
-                            //d.GeomSetOffsetPosition(prim.prim_geom,
-                            //    (Position.X - prm.Position.X) - pMass.c.X,
-                            //    (Position.Y - prm.Position.Y) - pMass.c.Y,
-                            //    (Position.Z - prm.Position.Z) - pMass.c.Z);
-                            //d.GeomSetOffsetRotation(prim_geom, ref mat2);
-                            d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
-                            d.BodySetMass(Body, ref pMass);
-
-                            d.BodySetAutoDisableFlag(Body, true);
-                            d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
+                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
-                            m_interpenetrationcount = 0;
-                            m_collisionscore = 0;
-                            m_disabled = false;
+                d.Quaternion quat2 = new d.Quaternion();
+                quat2.W = _orientation.W;
+                quat2.X = _orientation.X;
+                quat2.Y = _orientation.Y;
+                quat2.Z = _orientation.Z;
 
-                            // The body doesn't already have a finite rotation mode set here
-                            if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
-                            {
-                                createAMotor(m_angularlock);
-                            }
-                            d.BodySetPosition(Body, Position.X, Position.Y, Position.Z);
-                            if (m_vehicle.Type != Vehicle.TYPE_NONE)
-                                m_vehicle.Enable(Body, _parent_scene);
+                d.Matrix3 mat2 = new d.Matrix3();
+                d.RfromQ(out mat2, ref quat2);
+                d.GeomSetBody(prim_geom, Body);
+                d.GeomSetOffsetWorldPosition(prim_geom, Position.X - pMass.c.X, Position.Y - pMass.c.Y, Position.Z - pMass.c.Z);
+                //d.GeomSetOffsetPosition(prim.prim_geom,
+                //    (Position.X - prm.Position.X) - pMass.c.X,
+                //    (Position.Y - prm.Position.Y) - pMass.c.Y,
+                //    (Position.Z - prm.Position.Z) - pMass.c.Z);
+                //d.GeomSetOffsetRotation(prim_geom, ref mat2);
+                d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
+                d.BodySetMass(Body, ref pMass);
 
-                            _parent_scene.ActivatePrim(this);
-                        }
-                    }
+                d.BodySetAutoDisableFlag(Body, true);
+                d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
+
+                m_interpenetrationcount = 0;
+                m_collisionscore = 0;
+                m_disabled = false;
+
+                // The body doesn't already have a finite rotation mode set here
+                if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
+                {
+                    createAMotor(m_angularlock);
                 }
+
+                d.BodySetPosition(Body, Position.X, Position.Y, Position.Z);
+
+                if (m_vehicle.Type != Vehicle.TYPE_NONE)
+                    m_vehicle.Enable(Body, _parent_scene);
+
+                _parent_scene.ActivatePrim(this);
             }
         }
 
         private void ChildSetGeom(OdePrim odePrim)
         {
+//            m_log.DebugFormat(
+//                "[ODE PRIM]: ChildSetGeom {0} {1} for {2} {3}", odePrim.Name, odePrim.LocalID, Name, LocalID);
+
             //if (IsPhysical && Body != IntPtr.Zero)
             lock (childrenPrim)
             {
@@ -1210,12 +1197,14 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     //prm.childPrim = false;
                 }
             }
+
             disableBody();
 
-            if (Body != IntPtr.Zero)
-            {
-                _parent_scene.DeactivatePrim(this);
-            }
+            // Spurious - Body == IntPtr.Zero after disableBody()
+//            if (Body != IntPtr.Zero)
+//            {
+//                _parent_scene.DeactivatePrim(this);
+//            }
 
             lock (childrenPrim)
             {
@@ -1229,6 +1218,9 @@ Console.WriteLine("ZProcessTaints for " + Name);
 
         private void ChildDelink(OdePrim odePrim)
         {
+//            m_log.DebugFormat(
+//                "[ODE PRIM]: Delinking prim {0} {1} from {2} {3}", odePrim.Name, odePrim.LocalID, Name, LocalID);
+
             // Okay, we have a delinked child..   need to rebuild the body.
             lock (childrenPrim)
             {
@@ -1243,6 +1235,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     //prm.childPrim = false;
                 }
             }
+
             disableBody();
 
             lock (childrenPrim)
@@ -1251,10 +1244,11 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 childrenPrim.Remove(odePrim);
             }
 
-            if (Body != IntPtr.Zero)
-            {
-                _parent_scene.DeactivatePrim(this);
-            }
+            // Spurious - Body == IntPtr.Zero after disableBody()
+//            if (Body != IntPtr.Zero)
+//            {
+//                _parent_scene.DeactivatePrim(this);
+//            }
 
             lock (childrenPrim)
             {
@@ -1303,11 +1297,8 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     disableBodySoft();
                 }
 
-                if (prim_geom != IntPtr.Zero)
-                {
-                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
-                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
-                }
+                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
                 if (IsPhysical)
                 {
@@ -1328,11 +1319,8 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 if (m_collidesWater)
                     m_collisionFlags |= CollisionCategories.Water;
 
-                if (prim_geom != IntPtr.Zero)
-                {
-                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
-                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
-                }
+                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
 
                 if (IsPhysical)
                 {
@@ -1472,6 +1460,9 @@ Console.WriteLine("CreateGeom:");
             }
             else
             {
+                m_log.WarnFormat(
+                    "[ODE PRIM]: Called RemoveGeom() on {0} {1} where geometry was already null.", Name, LocalID);
+
                 return false;
             }
         }
@@ -1505,16 +1496,13 @@ Console.WriteLine("changeadd 1");
 #endif
             CreateGeom(m_targetSpace, mesh);
 
-            if (prim_geom != IntPtr.Zero)
-            {
-                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
-                d.Quaternion myrot = new d.Quaternion();
-                myrot.X = _orientation.X;
-                myrot.Y = _orientation.Y;
-                myrot.Z = _orientation.Z;
-                myrot.W = _orientation.W;
-                d.GeomSetQuaternion(prim_geom, ref myrot);
-            }
+            d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+            d.Quaternion myrot = new d.Quaternion();
+            myrot.X = _orientation.X;
+            myrot.Y = _orientation.Y;
+            myrot.Z = _orientation.Z;
+            myrot.W = _orientation.W;
+            d.GeomSetQuaternion(prim_geom, ref myrot);
 
             if (IsPhysical && Body == IntPtr.Zero)
                 enableBody();
@@ -1579,24 +1567,20 @@ Console.WriteLine(" JointCreateFixed");
                     //m_log.Debug("[BUG]: race!");
                 //}
             }
-            else
-            {
-                // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
-                // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
-//                _parent_scene.waitForSpaceUnlock(m_targetSpace);
 
-                IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
-                m_targetSpace = tempspace;
+            // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
+            // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
+//          _parent_scene.waitForSpaceUnlock(m_targetSpace);
+
+            IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
+            m_targetSpace = tempspace;
 
 //                _parent_scene.waitForSpaceUnlock(m_targetSpace);
-                if (prim_geom != IntPtr.Zero)
-                {
-                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+
+            d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
 
 //                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
-                    d.SpaceAdd(m_targetSpace, prim_geom);
-                }
-            }
+            d.SpaceAdd(m_targetSpace, prim_geom);
 
             changeSelectedStatus();
 
@@ -2047,18 +2031,16 @@ Console.WriteLine(" JointCreateFixed");
         {
             m_collidesWater = m_taintCollidesWater;
 
-            if (prim_geom != IntPtr.Zero)
+            if (m_collidesWater)
             {
-                if (m_collidesWater)
-                {
-                    m_collisionFlags |= CollisionCategories.Water;
-                }
-                else
-                {
-                    m_collisionFlags &= ~CollisionCategories.Water;
-                }
-                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                m_collisionFlags |= CollisionCategories.Water;
             }
+            else
+            {
+                m_collisionFlags &= ~CollisionCategories.Water;
+            }
+
+            d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 842ff91..409b27b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2226,7 +2226,8 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <param name="prim"></param>
         internal void RemovePrimThreadLocked(OdePrim prim)
         {
-//Console.WriteLine("RemovePrimThreadLocked " +  prim.m_primName);
+//            m_log.DebugFormat("[ODE SCENE]: Removing physical prim {0} {1}", prim.Name, prim.LocalID);
+
             lock (prim)
             {
                 RemoveCollisionEventReporting(prim);
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index bb5bacc..2027ca6 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -27,17 +27,22 @@
 
 using System;
 using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
-
 namespace OpenSim.Region.ScriptEngine.Interfaces
 {
     public interface IScriptApi
     {
-        //
-        // Each API has an identifier, which is used to load the
-        // proper runtime assembly at load time.
-        //
-        void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, UUID item);
+        /// <summary>
+        /// Initialize the API
+        /// </summary>
+        /// <remarks>
+        /// Each API has an identifier, which is used to load the
+        /// proper runtime assembly at load time.
+        /// <param name='engine'>/param>
+        /// <param name='part'></param>
+        /// <param name='item'></param>
+        void Initialize(IScriptEngine engine, SceneObjectPart part, TaskInventoryItem item);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
index 47ed6ba..684138f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs
@@ -29,42 +29,43 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using log4net;
 using OpenSim.Region.ScriptEngine.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     public class ApiManager
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private Dictionary<string,Type> m_Apis = new Dictionary<string,Type>();
 
         public string[] GetApis()
         {
-            if (m_Apis.Count > 0)
+            if (m_Apis.Count <= 0)
             {
-                List<string> l = new List<string>(m_Apis.Keys);
-                return l.ToArray();
-            }
+                Assembly a = Assembly.GetExecutingAssembly();
 
-            Assembly a = Assembly.GetExecutingAssembly();
+                Type[] types = a.GetExportedTypes();
 
-            Type[] types = a.GetExportedTypes();
-
-            foreach (Type t in types)
-            {
-                string name = t.ToString();
-                int idx = name.LastIndexOf('.');
-                if (idx != -1)
-                    name = name.Substring(idx+1);
-
-                if (name.EndsWith("_Api"))
+                foreach (Type t in types)
                 {
-                    name = name.Substring(0, name.Length - 4);
-                    m_Apis[name] = t;
+                    string name = t.ToString();
+                    int idx = name.LastIndexOf('.');
+                    if (idx != -1)
+                        name = name.Substring(idx+1);
+
+                    if (name.EndsWith("_Api"))
+                    {
+                        name = name.Substring(0, name.Length - 4);
+                        m_Apis[name] = t;
+                    }
                 }
             }
 
-            List<string> ret = new List<string>(m_Apis.Keys);
-            return ret.ToArray();
+//            m_log.DebugFormat("[API MANAGER]: Found {0} apis", m_Apis.Keys.Count);
+
+            return new List<string>(m_Apis.Keys).ToArray();
         }
 
         public IScriptApi CreateApi(string api)
@@ -76,4 +77,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return ret;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 489c1c6..b5fa6de 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -59,16 +59,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
-        internal uint m_localID;
-        internal UUID m_itemID;
+        internal TaskInventoryItem m_item;
         internal bool m_CMFunctionsEnabled = false;
 
-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = ScriptEngine;
             m_host = host;
-            m_localID = localID;
-            m_itemID = itemID;
+            m_item = item;
 
             if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
                 m_CMFunctionsEnabled = true;
@@ -95,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public string cmDetectedCountry(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return String.Empty;
             return detectedParams.Country;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e18d9cf..c7e59ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -88,8 +88,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         protected IScriptEngine m_ScriptEngine;
         protected SceneObjectPart m_host;
-        protected uint m_localID;
-        protected UUID m_itemID;
+
+        /// <summary>
+        /// The item that hosts this script
+        /// </summary>
+        protected TaskInventoryItem m_item;
+
         protected bool throwErrorOnNotImplemented = true;
         protected AsyncCommandManager AsyncCommands = null;
         protected float m_ScriptDelayFactor = 1.0f;
@@ -107,11 +111,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected IUrlModule m_UrlModule = null;
         protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
                 new Dictionary<UUID, UserInfoCacheEntry>();
+            protected int EMAIL_PAUSE_TIME = 20;  // documented delay value for smtp.
 
         protected Timer m_ShoutSayTimer;
         protected int m_SayShoutCount = 0;
 
-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ShoutSayTimer = new Timer(1000);
             m_ShoutSayTimer.Elapsed += SayShoutTimerElapsed;
@@ -120,10 +125,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_ScriptEngine = ScriptEngine;
             m_host = host;
-            m_localID = localID;
-            m_itemID = itemID;
+            m_item = item;
             m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
 
+            LoadLimits();  // read script limits from config.
+
+            m_TransferModule =
+                    m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>();
+            m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
+
+            AsyncCommands = new AsyncCommandManager(ScriptEngine);
+        }
+
+        /* load configuration items that affect script, object and run-time behavior. */
+        private void LoadLimits()
+        {
             m_ScriptDelayFactor =
                 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
             m_ScriptDistanceFactor =
@@ -136,12 +152,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255);
             if (m_notecardLineReadCharsMax > 65535)
                 m_notecardLineReadCharsMax = 65535;
-
-            m_TransferModule =
-                    m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>();
-            m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
-
-            AsyncCommands = new AsyncCommandManager(ScriptEngine);
+            // load limits for particular subsystems.
+            IConfig SMTPConfig;
+            if ((SMTPConfig = m_ScriptEngine.ConfigSource.Configs["SMTP"]) != null) {
+                // there's an smtp config, so load in the snooze time.
+                EMAIL_PAUSE_TIME = SMTPConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME);
+            }
         }
 
         public override Object InitializeLifetimeService()
@@ -173,7 +189,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         [DebuggerNonUserCode]
         public void state(string newState)
         {
-            m_ScriptEngine.SetState(m_itemID, newState);
+            m_ScriptEngine.SetState(m_item.ItemID, newState);
         }
 
         /// <summary>
@@ -184,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llResetScript()
         {
             m_host.AddScriptLPS(1);
-            m_ScriptEngine.ApiResetScript(m_itemID);
+            m_ScriptEngine.ApiResetScript(m_item.ItemID);
         }
 
         public void llResetOtherScript(string name)
@@ -336,30 +352,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        protected UUID InventorySelf()
-        {
-            UUID invItemID = new UUID();
-            bool unlock = false;
-            if (!m_host.TaskInventory.IsReadLockedByMe())
-            {
-                m_host.TaskInventory.LockItemsForRead(true);
-                unlock = true;
-            }
-            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
-            {
-                if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
-                {
-                    invItemID = inv.Key;
-                    break;
-                }
-            }
-            if (unlock)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-            }
-            return invItemID;
-        }
-
         protected UUID InventoryKey(string name, int type)
         {
             m_host.AddScriptLPS(1);
@@ -941,20 +933,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void  llRegionSayTo(string target, int channel, string msg)
         {
-            string error = String.Empty;
-
             if (msg.Length > 1023)
                 msg = msg.Substring(0, 1023);
 
             m_host.AddScriptLPS(1);
 
+            if (channel == ScriptBaseClass.DEBUG_CHANNEL)
+            {
+                return;
+            }
+
             UUID TargetID;
             UUID.TryParse(target, out TargetID);
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
-                    LSLError(error);
+                wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
         }
 
         public LSL_Integer llListen(int channelID, string name, string ID, string msg)
@@ -964,7 +958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID.TryParse(ID, out keyID);
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                return wComm.Listen(m_localID, m_itemID, m_host.UUID, channelID, name, keyID, msg);
+                return wComm.Listen(m_host.LocalId, m_item.ItemID, m_host.UUID, channelID, name, keyID, msg);
             else
                 return -1;
         }
@@ -974,7 +968,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                wComm.ListenControl(m_itemID, number, active);
+                wComm.ListenControl(m_item.ItemID, number, active);
         }
 
         public void llListenRemove(int number)
@@ -982,7 +976,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                wComm.ListenRemove(m_itemID, number);
+                wComm.ListenRemove(m_item.ItemID, number);
         }
 
         public void llSensor(string name, string id, int type, double range, double arc)
@@ -991,7 +985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID keyID = UUID.Zero;
             UUID.TryParse(id, out keyID);
 
-            AsyncCommands.SensorRepeatPlugin.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
+            AsyncCommands.SensorRepeatPlugin.SenseOnce(m_host.LocalId, m_item.ItemID, name, keyID, type, range, arc, m_host);
        }
 
         public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate)
@@ -1000,13 +994,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID keyID = UUID.Zero;
             UUID.TryParse(id, out keyID);
 
-            AsyncCommands.SensorRepeatPlugin.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
+            AsyncCommands.SensorRepeatPlugin.SetSenseRepeatEvent(m_host.LocalId, m_item.ItemID, name, keyID, type, range, arc, rate, m_host);
         }
 
         public void llSensorRemove()
         {
             m_host.AddScriptLPS(1);
-            AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_localID, m_itemID);
+            AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_host.LocalId, m_item.ItemID);
         }
 
         public string resolveName(UUID objecUUID)
@@ -1047,7 +1041,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llDetectedName(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return String.Empty;
             return detectedParams.Name;
@@ -1056,7 +1050,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llDetectedKey(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return String.Empty;
             return detectedParams.Key.ToString();
@@ -1065,7 +1059,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llDetectedOwner(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return String.Empty;
             return detectedParams.Owner.ToString();
@@ -1074,7 +1068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llDetectedType(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return 0;
             return new LSL_Integer(detectedParams.Type);
@@ -1083,7 +1077,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedPos(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return new LSL_Vector();
             return detectedParams.Position;
@@ -1092,7 +1086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedVel(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return new LSL_Vector();
             return detectedParams.Velocity;
@@ -1101,7 +1095,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedGrab(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams parms = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (parms == null)
                 return new LSL_Vector(0, 0, 0);
 
@@ -1111,7 +1105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Rotation llDetectedRot(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return new LSL_Rotation();
             return detectedParams.Rotation;
@@ -1120,7 +1114,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llDetectedGroup(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (detectedParams == null)
                 return new LSL_Integer(0);
             if (m_host.GroupID == detectedParams.Group)
@@ -1131,7 +1125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llDetectedLinkNumber(int number)
         {
             m_host.AddScriptLPS(1);
-            DetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
+            DetectParams parms = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
             if (parms == null)
                 return new LSL_Integer(0);
 
@@ -1144,7 +1138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedTouchBinormal(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Vector();
             return detectedParams.TouchBinormal;
@@ -1156,7 +1150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llDetectedTouchFace(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Integer(-1);
             return new LSL_Integer(detectedParams.TouchFace);
@@ -1168,7 +1162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedTouchNormal(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Vector();
             return detectedParams.TouchNormal;
@@ -1180,7 +1174,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedTouchPos(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Vector();
             return detectedParams.TouchPos;
@@ -1192,7 +1186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedTouchST(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Vector(-1.0, -1.0, 0.0);
             return detectedParams.TouchST;
@@ -1204,7 +1198,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llDetectedTouchUV(int index)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
             if (detectedParams == null)
                 return new LSL_Vector(-1.0, -1.0, 0.0);
             return detectedParams.TouchUV;
@@ -1910,6 +1904,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 rgb.y = texcolor.G;
                 rgb.z = texcolor.B;
                 return rgb;
+
             }
             else
             {
@@ -2948,20 +2943,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Integer llGiveMoney(string destination, int amount)
         {
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero)
-                return 0;
-
             m_host.AddScriptLPS(1);
 
-            m_host.TaskInventory.LockItemsForRead(true);
-            TaskInventoryItem item = m_host.TaskInventory[invItemID];
-            m_host.TaskInventory.LockItemsForRead(false);
-
-            if (item.PermsGranter == UUID.Zero)
+            if (m_item.PermsGranter == UUID.Zero)
                 return 0;
 
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
             {
                 LSLError("No permissions to give money");
                 return 0;
@@ -3148,11 +3135,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 sec = m_MinTimerInterval;
             m_host.AddScriptLPS(1);
             // Setting timer repeat
-            AsyncCommands.TimerPlugin.SetTimerEvent(m_localID, m_itemID, sec);
+            AsyncCommands.TimerPlugin.SetTimerEvent(m_host.LocalId, m_item.ItemID, sec);
         }
 
         public virtual void llSleep(double sec)
         {
+//            m_log.Info("llSleep snoozing " + sec + "s.");
             m_host.AddScriptLPS(1);
             Thread.Sleep((int)(sec * 1000));
         }
@@ -3211,29 +3199,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llTakeControls(int controls, int accept, int pass_on)
         {
-            TaskInventoryItem item;
-
-            m_host.TaskInventory.LockItemsForRead(true);
-            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return;
-            }
-            else
-            {
-                item = m_host.TaskInventory[InventorySelf()];
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-
-            if (item.PermsGranter != UUID.Zero)
+            if (m_item.PermsGranter != UUID.Zero)
             {
-                ScenePresence presence = World.GetScenePresence(item.PermsGranter);
+                ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
 
                 if (presence != null)
                 {
-                    if ((item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
+                    if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
                     {
-                        presence.RegisterControlEventsToScript(controls, accept, pass_on, m_localID, m_itemID);
+                        presence.RegisterControlEventsToScript(controls, accept, pass_on, m_host.LocalId, m_item.ItemID);
                     }
                 }
             }
@@ -3243,38 +3217,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llReleaseControls()
         {
-            TaskInventoryItem item;
-
-            m_host.TaskInventory.LockItemsForRead(true);
-            lock (m_host.TaskInventory)
-            {
-                
-                if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-                {
-                    m_host.TaskInventory.LockItemsForRead(false);
-                    return;
-                }
-                else
-                {
-                    item = m_host.TaskInventory[InventorySelf()];
-                }
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-
             m_host.AddScriptLPS(1);
 
-            if (item.PermsGranter != UUID.Zero)
+            if (m_item.PermsGranter != UUID.Zero)
             {
-                ScenePresence presence = World.GetScenePresence(item.PermsGranter);
+                ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
 
                 if (presence != null)
                 {
-                    if ((item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
+                    if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
                     {
                         // Unregister controls from Presence
-                        presence.UnRegisterControlEventsToScript(m_localID, m_itemID);
+                        presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
                         // Remove Take Control permission.
-                        item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
+                        m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
                     }
                 }
             }
@@ -3287,86 +3243,71 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_UrlModule.ReleaseURL(url);
         }
 
-        public void llAttachToAvatar(int attachment)
+        /// <summary>
+        /// Attach the object containing this script to the avatar that owns it.
+        /// </summary>
+        /// <param name='attachment'>The attachment point (e.g. ATTACH_CHEST)</param>
+        /// <returns>true if the attach suceeded, false if it did not</returns>
+        public bool AttachToAvatar(int attachmentPoint)
         {
-            m_host.AddScriptLPS(1);
-
-            TaskInventoryItem item;
+            SceneObjectGroup grp = m_host.ParentGroup;
+            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
 
-            m_host.TaskInventory.LockItemsForRead(true);
+            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
 
-            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return;
-            }
+            if (attachmentsModule != null)
+                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false);
             else
-            {
-                item = m_host.TaskInventory[InventorySelf()];
-            }
-
-            m_host.TaskInventory.LockItemsForRead(false);
+                return false;
+        }
 
-            if (item.PermsGranter != m_host.OwnerID)
-                return;
+        /// <summary>
+        /// Detach the object containing this script from the avatar it is attached to.
+        /// </summary>
+        /// <remarks>
+        /// Nothing happens if the object is not attached.
+        /// </remarks>
+        public void DetachFromAvatar()
+        {
+            Util.FireAndForget(DetachWrapper, m_host);
+        }
 
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
-            {
-                SceneObjectGroup grp = m_host.ParentGroup;
+        private void DetachWrapper(object o)
+        {
+            SceneObjectPart host = (SceneObjectPart)o;
 
-                ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+            SceneObjectGroup grp = host.ParentGroup;
+            UUID itemID = grp.FromItemID;
+            ScenePresence presence = World.GetScenePresence(host.OwnerID);
 
-                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-                if (attachmentsModule != null)
-                    attachmentsModule.AttachObject(presence, grp, (uint)attachment, false);
-            }
+            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
+            if (attachmentsModule != null)
+                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
         }
 
-        public void llDetachFromAvatar()
+        public void llAttachToAvatar(int attachmentPoint)
         {
             m_host.AddScriptLPS(1);
 
-            if (m_host.ParentGroup.AttachmentPoint == 0)
+            if (m_item.PermsGranter != m_host.OwnerID)
                 return;
 
-            TaskInventoryItem item;
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
+                AttachToAvatar(attachmentPoint);
+        }
 
-            m_host.TaskInventory.LockItemsForRead(true);
+        public void llDetachFromAvatar()
+        {
+            m_host.AddScriptLPS(1);
 
-            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
+            if (m_host.ParentGroup.AttachmentPoint == 0)
                 return;
-            }
-            else
-            {
-                item = m_host.TaskInventory[InventorySelf()];
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
 
-
-            if (item.PermsGranter != m_host.OwnerID)
+            if (m_item.PermsGranter != m_host.OwnerID)
                 return;
 
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
-            {
-                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-                if (attachmentsModule != null)
-                    Util.FireAndForget(DetachWrapper, m_host);
-            }
-        }
-
-        private void DetachWrapper(object o)
-        {
-            SceneObjectPart host = (SceneObjectPart)o;
-
-            SceneObjectGroup grp = host.ParentGroup;
-            UUID itemID = grp.FromItemID;
-            ScenePresence presence = World.GetScenePresence(host.OwnerID);
-
-            IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
-            if (attachmentsModule != null)
-                attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
+                DetachFromAvatar();
         }
 
         public void llTakeCamera(string avatar)
@@ -3487,7 +3428,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             emailModule.SendEmail(m_host.UUID, address, subject, message);
-            ScriptSleep(15000);
+            ScriptSleep(EMAIL_PAUSE_TIME * 1000);
         }
 
         public void llGetNextEmail(string address, string subject)
@@ -3524,6 +3465,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return m_host.UUID.ToString();
         }
 
+        public LSL_Key llGenerateKey()
+        {
+            m_host.AddScriptLPS(1);
+            return UUID.Random().ToString();
+        }
+
         public void llSetBuoyancy(double buoyancy)
         {
             m_host.AddScriptLPS(1);
@@ -3570,7 +3517,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             try
             {
-                m_ScriptEngine.SetMinEventDelay(m_itemID, delay);
+                m_ScriptEngine.SetMinEventDelay(m_item.ItemID, delay);
             }
             catch (NotImplementedException)
             {
@@ -3623,29 +3570,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero)
+            if (m_item.PermsGranter == UUID.Zero)
                 return;
 
-            TaskInventoryItem item;
-
-            m_host.TaskInventory.LockItemsForRead(true);
-            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
             {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return;
-            }
-            else
-            {
-                item = m_host.TaskInventory[InventorySelf()];
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-            if (item.PermsGranter == UUID.Zero)
-                return;
-
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
-            {
-                ScenePresence presence = World.GetScenePresence(item.PermsGranter);
+                ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
 
                 if (presence != null)
                 {
@@ -3663,38 +3593,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero)
-                return;
-
-            TaskInventoryItem item;
-
-            m_host.TaskInventory.LockItemsForRead(true);
-            if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return;
-            }
-            else
-            {
-                item = m_host.TaskInventory[InventorySelf()];
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-            
-
-            if (item.PermsGranter == UUID.Zero)
+            if (m_item.PermsGranter == UUID.Zero)
                 return;
 
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
             {
                 UUID animID = new UUID();
 
                 if (!UUID.TryParse(anim, out animID))
                 {
-                    animID=InventoryKey(anim);
+                    animID = InventoryKey(anim);
                 }
 
-                ScenePresence presence = World.GetScenePresence(item.PermsGranter);
+                ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
 
                 if (presence != null)
                 {
@@ -3730,44 +3641,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetStartParameter()
         {
             m_host.AddScriptLPS(1);
-            return m_ScriptEngine.GetStartParameter(m_itemID);
+            return m_ScriptEngine.GetStartParameter(m_item.ItemID);
         }
 
         public void llRequestPermissions(string agent, int perm)
         {
-            UUID agentID = new UUID();
+            UUID agentID;
 
             if (!UUID.TryParse(agent, out agentID))
                 return;
 
-            UUID invItemID = InventorySelf();
-
-            if (invItemID == UUID.Zero)
-                return; // Not in a prim? How??
-
-            TaskInventoryItem item;
-
-
-            m_host.TaskInventory.LockItemsForRead(true);
-            if (!m_host.TaskInventory.ContainsKey(invItemID))
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return;
-            }
-            else
-            {
-                item = m_host.TaskInventory[invItemID];
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-
             if (agentID == UUID.Zero || perm == 0) // Releasing permissions
             {
                 llReleaseControls();
 
-                item.PermsGranter = UUID.Zero;
-                item.PermsMask = 0;
+                m_item.PermsGranter = UUID.Zero;
+                m_item.PermsMask = 0;
 
-                m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+                m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                         "run_time_permissions", new Object[] {
                         new LSL_Integer(0) },
                         new DetectParams[0]));
@@ -3775,7 +3666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            if (item.PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
+            if (m_item.PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
                 llReleaseControls();
 
             m_host.AddScriptLPS(1);
@@ -3792,11 +3683,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
                 {
                     m_host.TaskInventory.LockItemsForWrite(true);
-                    m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                    m_host.TaskInventory[invItemID].PermsMask = perm;
+                    m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
                     m_host.TaskInventory.LockItemsForWrite(false);
 
-                    m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+                    m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                             "run_time_permissions", new Object[] {
                             new LSL_Integer(perm) },
                             new DetectParams[0]));
@@ -3831,11 +3722,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
                     {
                         m_host.TaskInventory.LockItemsForWrite(true);
-                        m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[invItemID].PermsMask = perm;
+                        m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                        m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
                         m_host.TaskInventory.LockItemsForWrite(false);
 
-                        m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+                        m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                                 "run_time_permissions", new Object[] {
                                 new LSL_Integer(perm) },
                                 new DetectParams[0]));
@@ -3856,8 +3747,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (!m_waitingForScriptAnswer)
                 {
                     m_host.TaskInventory.LockItemsForWrite(true);
-                    m_host.TaskInventory[invItemID].PermsGranter = agentID;
-                    m_host.TaskInventory[invItemID].PermsMask = 0;
+                    m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
                     m_host.TaskInventory.LockItemsForWrite(false);
 
                     presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
@@ -3865,13 +3756,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
 
                 presence.ControllingClient.SendScriptQuestion(
-                    m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, invItemID, perm);
+                    m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, m_item.ItemID, perm);
 
                 return;
             }
 
             // Requested agent is not in range, refuse perms
-            m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+            m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                     "run_time_permissions", new Object[] {
                     new LSL_Integer(0) },
                     new DetectParams[0]));
@@ -3882,24 +3773,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (taskID != m_host.UUID)
                 return;
 
-            UUID invItemID = InventorySelf();
-
-            if (invItemID == UUID.Zero)
-                return;
-
-            client.OnScriptAnswer-=handleScriptAnswer;
-            m_waitingForScriptAnswer=false;
+            client.OnScriptAnswer -= handleScriptAnswer;
+            m_waitingForScriptAnswer = false;
 
             if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
                 llReleaseControls();
 
-            
             m_host.TaskInventory.LockItemsForWrite(true);
-            m_host.TaskInventory[invItemID].PermsMask = answer;
+            m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
             m_host.TaskInventory.LockItemsForWrite(false);
             
-
-            m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+            m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                     "run_time_permissions", new Object[] {
                     new LSL_Integer(answer) },
                     new DetectParams[0]));
@@ -3909,41 +3793,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            m_host.TaskInventory.LockItemsForRead(true);
-            
-            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-            {
-                if (item.Type == 10 && item.ItemID == m_itemID)
-                {
-                    m_host.TaskInventory.LockItemsForRead(false);
-                    return item.PermsGranter.ToString();
-                }
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-
-            return UUID.Zero.ToString();
+            return m_item.PermsGranter.ToString();
         }
 
         public LSL_Integer llGetPermissions()
         {
             m_host.AddScriptLPS(1);
 
-            m_host.TaskInventory.LockItemsForRead(true);
+            int perms = m_item.PermsMask;
 
-            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-            {
-                if (item.Type == 10 && item.ItemID == m_itemID)
-                {
-                    int perms = item.PermsMask;
-                    if (m_automaticLinkPermission)
-                        perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
-                    m_host.TaskInventory.LockItemsForRead(false);
-                    return perms;
-                }
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
+            if (m_automaticLinkPermission)
+                perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
 
-            return 0;
+            return perms;
         }
 
         public LSL_Integer llGetLinkNumber()
@@ -3981,18 +3843,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llCreateLink(string target, int parent)
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
+
             UUID targetID;
 
             if (!UUID.TryParse(target, out targetID))
                 return;
 
-            TaskInventoryItem item;
-            m_host.TaskInventory.LockItemsForRead(true);
-            item = m_host.TaskInventory[invItemID];
-            m_host.TaskInventory.LockItemsForRead(false);
-             
-            if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
             {
                 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
@@ -4000,7 +3857,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             IClientAPI client = null;
-            ScenePresence sp = World.GetScenePresence(item.PermsGranter);
+            ScenePresence sp = World.GetScenePresence(m_item.PermsGranter);
             if (sp != null)
                 client = sp.ControllingClient;
 
@@ -4046,18 +3903,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llBreakLink(int linknum)
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
 
-            m_host.TaskInventory.LockItemsForRead(true);
-                if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
-                    && !m_automaticLinkPermission)
-                {
-                    ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
-                    m_host.TaskInventory.LockItemsForRead(false);
-                    return;
-                }
-            m_host.TaskInventory.LockItemsForRead(false);
-            
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+                && !m_automaticLinkPermission)
+            {
+                ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                return;
+            }
+
             if (linknum < ScriptBaseClass.LINK_THIS)
                 return;
 
@@ -4156,12 +4009,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID invItemID = InventorySelf();
-
-            TaskInventoryItem item;
-            m_host.TaskInventory.LockItemsForRead(true);
-            item = m_host.TaskInventory[invItemID];
-            m_host.TaskInventory.LockItemsForRead(false);
+            TaskInventoryItem item = m_item;
              
             if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
                 && !m_automaticLinkPermission)
@@ -4472,7 +4320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (item.Name == name)
                 {
-                    if (item.ItemID == m_itemID)
+                    if (item.ItemID == m_item.ItemID)
                         throw new ScriptDeleteException();
                     else
                         m_host.Inventory.RemoveInventoryItem(item.ItemID);
@@ -4606,8 +4454,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 UUID rq = UUID.Random();
 
                 UUID tid = AsyncCommands.
-                    DataserverPlugin.RegisterRequest(m_localID,
-                                                 m_itemID, rq.ToString());
+                    DataserverPlugin.RegisterRequest(m_host.LocalId,
+                                                 m_item.ItemID, rq.ToString());
 
                 AsyncCommands.
                 DataserverPlugin.DataserverReply(rq.ToString(), reply);
@@ -4634,8 +4482,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (item.Type == 3 && item.Name == name)
                 {
                     UUID tid = AsyncCommands.
-                        DataserverPlugin.RegisterRequest(m_localID,
-                                                     m_itemID, item.AssetID.ToString());
+                        DataserverPlugin.RegisterRequest(m_host.LocalId,
+                                                     m_item.ItemID, item.AssetID.ToString());
 
                     Vector3 region = new Vector3(
                         World.RegionInfo.RegionLocX * Constants.RegionSize,
@@ -5034,22 +4882,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String llGetScriptName()
         {
-            string result = String.Empty;
-
             m_host.AddScriptLPS(1);
 
-            m_host.TaskInventory.LockItemsForRead(true);
-            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-            {
-                if (item.Type == 10 && item.ItemID == m_itemID)
-                {
-                    result =  item.Name!=null?item.Name:String.Empty;
-                    break;
-                }
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
-
-            return result;
+            return m_item.Name != null ? m_item.Name : String.Empty;
         }
 
         public LSL_Integer llGetLinkNumberOfSides(int link)
@@ -6334,7 +6169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (m_host.OwnerID == land.LandData.OwnerID)
                     {
                         Vector3 pos = World.GetNearestAllowedPosition(presence, land);
-                        presence.TeleportWithMomentum(pos);
+                        presence.TeleportWithMomentum(pos, null);
                         presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
                     }
                 }
@@ -7281,14 +7116,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             if (xmlrpcMod.IsEnabled())
             {
-                UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero);
+                UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_host.LocalId, m_item.ItemID, UUID.Zero);
                 IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>();
                 if (xmlRpcRouter != null)
                 {
                     string ExternalHostName = m_ScriptEngine.World.RegionInfo.ExternalHostName;
 
                     xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID,
-                                                     m_itemID, String.Format("http://{0}:{1}/", ExternalHostName,
+                                                     m_item.ItemID, String.Format("http://{0}:{1}/", ExternalHostName,
                                                                              xmlrpcMod.Port.ToString()));
                 }
                 object[] resobj = new object[]
@@ -7300,7 +7135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         new LSL_Integer(0),
                         new LSL_String(String.Empty)
                     };
-                m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams("remote_data", resobj,
+                m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj,
                                                                          new DetectParams[0]));
             }
             ScriptSleep(1000);
@@ -7311,7 +7146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
             ScriptSleep(3000);
-            return (xmlrpcMod.SendRemoteData(m_localID, m_itemID, channel, dest, idata, sdata)).ToString();
+            return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString();
         }
 
         public void llRemoteDataReply(string channel, string message_id, string sdata, int idata)
@@ -8150,7 +7985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 return;
                             face = (int)rules.GetLSLIntegerItem(idx++);
                             int shiny = (int)rules.GetLSLIntegerItem(idx++);
-                            Bumpiness bump = (Bumpiness)Convert.ToByte((int)rules.GetLSLIntegerItem(idx++));
+                            Bumpiness bump = (Bumpiness)(int)rules.GetLSLIntegerItem(idx++);
 
                             SetShiny(part, face, shiny, bump);
 
@@ -9954,13 +9789,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             if (m_UrlModule != null)
-                return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString();
+                return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString();
             return UUID.Zero.ToString();
         }
 
         public LSL_String llRequestSimulatorData(string simulator, int data)
         {
-            IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL");
+            IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL");
 
             try
             {
@@ -10022,7 +9857,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 UUID rq = UUID.Random();
 
                 UUID tid = AsyncCommands.
-                    DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString());
+                    DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, rq.ToString());
 
                 AsyncCommands.
                     DataserverPlugin.DataserverReply(rq.ToString(), reply);
@@ -10041,7 +9876,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             if (m_UrlModule != null)
-                return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString();
+                return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString();
             return UUID.Zero.ToString();
         }
 
@@ -10077,7 +9912,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             // child agents have a mass of 1.0
                             return 1;
                         else
-                            return avatar.GetMass();
+                            return (double)avatar.GetMass();
                 }
                 catch (KeyNotFoundException)
                 {
@@ -10520,26 +10355,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llGetCameraPos()
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
 
-            if (invItemID == UUID.Zero)
-                return new LSL_Vector();
+            if (m_item.PermsGranter == UUID.Zero)
+               return new LSL_Vector();
 
-            m_host.TaskInventory.LockItemsForRead(true);
-
-            UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
-
-//            if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-            if (agentID == UUID.Zero)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return new LSL_Vector();
-            }
-
-            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
             {
                 ShoutError("No permissions to track the camera");
-                m_host.TaskInventory.LockItemsForRead(false);
                 return new LSL_Vector();
             }
             m_host.TaskInventory.LockItemsForRead(false);
@@ -10557,24 +10379,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Rotation llGetCameraRot()
         {
             m_host.AddScriptLPS(1);
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero)
-                return new LSL_Rotation();
 
-            m_host.TaskInventory.LockItemsForRead(true);
-
-            UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
+            if (m_item.PermsGranter == UUID.Zero)
+               return new LSL_Rotation();
 
-//            if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
-            if (agentID == UUID.Zero)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
-                return new LSL_Rotation();
-            }
-            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
             {
                 ShoutError("No permissions to track the camera");
-                m_host.TaskInventory.LockItemsForRead(false);
                 return new LSL_Rotation();
             }
             m_host.TaskInventory.LockItemsForRead(false);
@@ -10639,7 +10450,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector lookAt)
         {
             m_host.AddScriptLPS(1);
-            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
             if (detectedParams == null)
             {
                 if (m_host.ParentGroup.IsAttachment == true)
@@ -10763,30 +10574,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            // our key in the object we are in
-            UUID invItemID = InventorySelf();
-            if (invItemID == UUID.Zero) return;
-
             // the object we are in
             UUID objectID = m_host.ParentUUID;
-            if (objectID == UUID.Zero) return;
+            if (objectID == UUID.Zero)
+                return;
 
-            UUID agentID;
-            m_host.TaskInventory.LockItemsForRead(true);
             // we need the permission first, to know which avatar we want to set the camera for
-            agentID = m_host.TaskInventory[invItemID].PermsGranter;
+            UUID agentID = m_item.PermsGranter;
 
             if (agentID == UUID.Zero)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
                 return;
-            }
-            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
+
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
                 return;
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
@@ -10828,34 +10628,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            // our key in the object we are in
-            UUID invItemID=InventorySelf();
-            if (invItemID == UUID.Zero) return;
-
             // the object we are in
             UUID objectID = m_host.ParentUUID;
-            if (objectID == UUID.Zero) return;
+            if (objectID == UUID.Zero)
+                return;
 
             // we need the permission first, to know which avatar we want to clear the camera for
-            UUID agentID;
-            m_host.TaskInventory.LockItemsForRead(true);
-            agentID = m_host.TaskInventory[invItemID].PermsGranter;
+            UUID agentID = m_item.PermsGranter;
+
             if (agentID == UUID.Zero)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
                 return;
-            }
-            if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
-            {
-                m_host.TaskInventory.LockItemsForRead(false);
+
+            if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
                 return;
-            }
-            m_host.TaskInventory.LockItemsForRead(false);
 
             ScenePresence presence = World.GetScenePresence(agentID);
 
             // we are not interested in child-agents
-            if (presence.IsChildAgent) return;
+            if (presence.IsChildAgent)
+                return;
 
             presence.ControllingClient.SendClearFollowCamProperties(objectID);
         }
@@ -11046,8 +10837,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            UUID reqID = httpScriptMod.
-                StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body);
+            UUID reqID
+                = httpScriptMod.StartHttpRequest(m_host.LocalId, m_item.ItemID, url, param, httpHeaders, body);
 
             if (reqID != UUID.Zero)
                 return reqID.ToString();
@@ -11279,19 +11070,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 break;
                             // For the following 8 see the Object version below
                             case ScriptBaseClass.OBJECT_RUNNING_SCRIPT_COUNT:
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(av.RunningScriptCount()));
                                 break;
                             case ScriptBaseClass.OBJECT_TOTAL_SCRIPT_COUNT:
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(av.ScriptCount()));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_MEMORY:
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_TIME:
-                                ret.Add(new LSL_Float(0));
+                                ret.Add(new LSL_Float(av.ScriptExecutionTime() / 1000.0f));
                                 break;
                             case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(1));
                                 break;
                             case ScriptBaseClass.OBJECT_SERVER_COST:
                                 ret.Add(new LSL_Float(0));
@@ -11343,43 +11134,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_CREATOR:
                                 ret.Add(new LSL_String(obj.CreatorID.ToString()));
                                 break;
-                            // The following 8 I have intentionaly coded to return zero. They are part of
-                            // "Land Impact" calculations. These calculations are probably not applicable
-                            // to OpenSim, required figures (cpu/memory usage) are not currently tracked
-                            // I have intentionally left these all at zero rather than return possibly
-                            // missleading numbers
                             case ScriptBaseClass.OBJECT_RUNNING_SCRIPT_COUNT:
-                                // in SL this currently includes crashed scripts
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount()));
                                 break;
                             case ScriptBaseClass.OBJECT_TOTAL_SCRIPT_COUNT:
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(obj.ParentGroup.ScriptCount()));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_MEMORY:
                                 // The value returned in SL for mono scripts is 65536 * number of active scripts
-                                ret.Add(new LSL_Integer(0));
+                                // and 16384 * number of active scripts for LSO. since llGetFreememory
+                                // is coded to give the LSO value use it here
+                                ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384));
                                 break;
                             case ScriptBaseClass.OBJECT_SCRIPT_TIME:
-                                // Average cpu time per simulator frame expended on all scripts in the objetc
-                                ret.Add(new LSL_Float(0));
+                                // Average cpu time in seconds per simulator frame expended on all scripts in the object
+                                ret.Add(new LSL_Float(obj.ParentGroup.ScriptExecutionTime() / 1000.0f));
                                 break;
                             case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE:
                                 // according to the SL wiki A prim or linkset will have prim
                                 // equivalent of the number of prims in a linkset if it does not
                                 // contain a mesh anywhere in the link set or is not a normal prim
                                 // The value returned in SL for normal prims is prim count
-                                ret.Add(new LSL_Integer(0));
+                                ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
                                 break;
+                            // The following 3 costs I have intentionaly coded to return zero. They are part of
+                            // "Land Impact" calculations. These calculations are probably not applicable
+                            // to OpenSim and are not yet complete in SL
                             case ScriptBaseClass.OBJECT_SERVER_COST:
-                                // The value returned in SL for normal prims is prim count
+                                // The linden calculation is here
+                                // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight
+                                // The value returned in SL for normal prims looks like the prim count
                                 ret.Add(new LSL_Float(0));
                                 break;
                             case ScriptBaseClass.OBJECT_STREAMING_COST:
-                                // The value returned in SL for normal prims is prim count * 0.06
+                                // The linden calculation is here
+                                // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost
+                                // The value returned in SL for normal prims looks like the prim count * 0.06
                                 ret.Add(new LSL_Float(0));
                                 break;
                             case ScriptBaseClass.OBJECT_PHYSICS_COST:
-                                // The value returned in SL for normal prims is prim count
+                                // The linden calculation is here
+                                // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics
+                                // The value returned in SL for normal prims looks like the prim count
                                 ret.Add(new LSL_Float(0));
                                 break;
                             default:
@@ -11477,7 +11273,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             // was: UUID tid = tid = AsyncCommands.
-            UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString());
+            UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, assetID.ToString());
 
             if (NotecardCache.IsCached(assetID))
             {
@@ -11540,7 +11336,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             // was: UUID tid = tid = AsyncCommands.
-            UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString());
+            UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, assetID.ToString());
 
             if (NotecardCache.IsCached(assetID))
             {
@@ -11624,7 +11420,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             UUID rq = UUID.Random();
 
-            AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString());
+            AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, rq.ToString());
 
             AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id)));
 
@@ -11640,7 +11436,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             UUID rq = UUID.Random();
 
-            AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString());
+            AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, rq.ToString());
 
             AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id));
 
@@ -12134,7 +11930,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             bool isAccount = false;
             bool isGroup = false;
 
-            if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManager(m_host.OwnerID))
+            if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManagerOrOwner(m_host.OwnerID))
                 return 0;
 
             UUID id = new UUID();
@@ -12196,35 +11992,50 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 1;
         }
 
-        #region Not Implemented
-        //
-        // Listing the unimplemented lsl functions here, please move
-        // them from this region as they are completed
-        //
+        public LSL_Integer llGetMemoryLimit()
+        {
+            m_host.AddScriptLPS(1);
+            // The value returned for LSO scripts in SL
+            return 16384;
+        }
 
-        public void llGetEnv(LSL_String name)
+        public LSL_Integer llSetMemoryLimit(LSL_Integer limit)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetEnv");
+            // Treat as an LSO script
+            return ScriptBaseClass.FALSE;
         }
 
-        public void llGetSPMaxMemory()
+        public LSL_Integer llGetSPMaxMemory()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetSPMaxMemory");
+            // The value returned for LSO scripts in SL
+            return 16384;
         }
 
         public virtual LSL_Integer llGetUsedMemory()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetUsedMemory");
-            return 0;
+            // The value returned for LSO scripts in SL
+            return 16384;
         }
 
         public void llScriptProfiler(LSL_Integer flags)
         {
             m_host.AddScriptLPS(1);
-            //NotImplemented("llScriptProfiler");
+            // This does nothing for LSO scripts in SL
+        }
+
+        #region Not Implemented
+        //
+        // Listing the unimplemented lsl functions here, please move
+        // them from this region as they are completed
+        //
+
+        public void llGetEnv(LSL_String name)
+        {
+            m_host.AddScriptLPS(1);
+            NotImplemented("llGetEnv");
         }
 
         public void llSetSoundQueueing(int queue)
@@ -12304,8 +12115,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 try
                 {
-                    UUID invItemID=InventorySelf();
-                    if (invItemID == UUID.Zero)
+                    TaskInventoryItem item = m_item;
+                    if (item == null)
                     {
                         replydata = "SERVICE_ERROR";
                         return;
@@ -12313,10 +12124,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     m_host.AddScriptLPS(1);
 
-                    m_host.TaskInventory.LockItemsForRead(true);
-                    TaskInventoryItem item = m_host.TaskInventory[invItemID];
-                    m_host.TaskInventory.LockItemsForRead(false);
-
                     if (item.PermsGranter == UUID.Zero)
                     {
                         replydata = "MISSING_PERMISSION_DEBIT";
@@ -12358,7 +12165,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
                 finally
                 {
-                    m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
+                    m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                             "transaction_result", new Object[] {
                             new LSL_String(txn.ToString()),
                             new LSL_Integer(replycode),
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 77a784d..795de80 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -58,17 +58,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
-        internal uint m_localID;
-        internal UUID m_itemID;
         internal bool m_LSFunctionsEnabled = false;
         internal IScriptModuleComms m_comms = null;
 
-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = ScriptEngine;
             m_host = host;
-            m_localID = localID;
-            m_itemID = itemID;
 
             if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
                 m_LSFunctionsEnabled = true;
@@ -449,7 +445,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
@@ -477,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return;
@@ -500,7 +496,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 7c07e15..4bd3dff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -57,17 +57,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
         internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
-        internal uint m_localID;
-        internal UUID m_itemID;
+        internal TaskInventoryItem m_item;
         internal bool m_MODFunctionsEnabled = false;
         internal IScriptModuleComms m_comms = null;
 
-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = ScriptEngine;
             m_host = host;
-            m_localID = localID;
-            m_itemID = itemID;
+            m_item = item;
 
             if (m_ScriptEngine.Config.GetBoolean("AllowMODFunctions", false))
                 m_MODFunctionsEnabled = true;
@@ -252,7 +250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // non-null but don't trust it completely
             try 
             {
-                object result = m_comms.InvokeOperation(m_host.UUID, m_itemID, fname, convertedParms);
+                object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms);
                 if (result != null)
                     return result;
 
@@ -279,7 +277,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             UUID req = UUID.Random();
 
-            m_comms.RaiseEvent(m_itemID, req.ToString(), module, command, k);
+            m_comms.RaiseEvent(m_item.ItemID, req.ToString(), module, command, k);
 
             return req.ToString();
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 0dc2aa2..51ace1a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -128,11 +128,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public const string GridInfoServiceConfigSectionName = "GridInfoService";
+
         internal IScriptEngine m_ScriptEngine;
         internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there
         internal SceneObjectPart m_host;
-        internal uint m_localID;
-        internal UUID m_itemID;
+        internal TaskInventoryItem m_item;
         internal bool m_OSFunctionsEnabled = false;
         internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
         internal float m_ScriptDelayFactor = 1.0f;
@@ -140,12 +141,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         internal bool m_debuggerSafe = false;
         internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
 
-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
         {
             m_ScriptEngine = ScriptEngine;
             m_host = host;
-            m_localID = localID;
-            m_itemID = itemID;
+            m_item = item;
             m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
 
             if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
@@ -218,12 +218,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        /// <summary>
+        /// Initialize the LSL interface.
+        /// </summary>
+        /// <remarks>
+        /// FIXME: This is an abomination.  We should be able to set this up earlier but currently we have no
+        /// guarantee the interface is present on Initialize().  There needs to be another post initialize call from
+        /// ScriptInstance.
+        /// </remarks>
         private void InitLSL()
         {
             if (m_LSL_Api != null)
                 return;
 
-            m_LSL_Api = (ILSL_Api)m_ScriptEngine.GetApi(m_itemID, "LSL");
+            m_LSL_Api = (ILSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "LSL");
         }
 
         //
@@ -342,22 +350,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         return;
                     }
 
-                    TaskInventoryItem ti = m_host.Inventory.GetInventoryItem(m_itemID);
-                    if (ti == null)
-                    {
-                        OSSLError(
-                            String.Format("{0} permission error. Can't find script in prim inventory.",
-                            function));
-                    }
-
-                    UUID ownerID = ti.OwnerID;
+                    UUID ownerID = m_item.OwnerID;
 
-                    //OSSL only may be used if objet is in the same group as the parcel
+                    //OSSL only may be used if object is in the same group as the parcel
                     if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
                     {
                         ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
 
-                        if (land.LandData.GroupID == ti.GroupID && land.LandData.GroupID != UUID.Zero)
+                        if (land.LandData.GroupID == m_item.GroupID && land.LandData.GroupID != UUID.Zero)
                         {
                             return;
                         }
@@ -378,7 +378,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER"))
                     {
                         //Only Estate Managers may use the function
-                        if (World.RegionInfo.EstateSettings.IsEstateManager(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID)
+                        if (World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID)
                         {
                             return;
                         }
@@ -393,13 +393,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                     }
 
-                    if (!m_FunctionPerms[function].AllowedCreators.Contains(ti.CreatorID))
+                    if (!m_FunctionPerms[function].AllowedCreators.Contains(m_item.CreatorID))
                         OSSLError(
                             String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.",
                             function));
-                    if (ti.CreatorID != ownerID)
+
+                    if (m_item.CreatorID != ownerID)
                     {
-                        if ((ti.CurrentPermissions & (uint)PermissionMask.Modify) != 0)
+                        if ((m_item.CurrentPermissions & (uint)PermissionMask.Modify) != 0)
                             OSSLError(
                                 String.Format("{0} permission denied. Script permissions error.",
                                 function));
@@ -730,11 +731,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
+            // For safety, we add another permission check here, and don't rely only on the standard OSSL permissions
             if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
             {
                 MainConsole.Instance.RunCommand(command);
                 return true;
             }
+
             return false;
         }
 
@@ -1178,7 +1181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osSetStateEvents");
             m_host.AddScriptLPS(1);
 
-            m_host.SetScriptEvents(m_itemID, events);
+            m_host.SetScriptEvents(m_item.ItemID, events);
         }
 
         public void osSetRegionWaterHeight(double height)
@@ -1186,12 +1189,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osSetRegionWaterHeight");
 
             m_host.AddScriptLPS(1);
-            //Check to make sure that the script's owner is the estate manager/master
-            //World.Permissions.GenericEstatePermission(
-            if (World.Permissions.IsGod(m_host.OwnerID))
-            {
-                World.EventManager.TriggerRequestChangeWaterHeight((float)height);
-            }
+
+            World.EventManager.TriggerRequestChangeWaterHeight((float)height);
         }
 
         /// <summary>
@@ -1202,27 +1201,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <param name="sunHour">The "Sun Hour" that is desired, 0...24, with 0 just after SunRise</param>
         public void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour)
         {
-            CheckThreatLevel(ThreatLevel.Nuisance, "osSetRegionSunSettings");
+            CheckThreatLevel(ThreatLevel.High, "osSetRegionSunSettings");
 
             m_host.AddScriptLPS(1);
-            //Check to make sure that the script's owner is the estate manager/master
-            //World.Permissions.GenericEstatePermission(
-            if (World.Permissions.IsGod(m_host.OwnerID))
-            {
-                while (sunHour > 24.0)
-                    sunHour -= 24.0;
 
-                while (sunHour < 0)
-                    sunHour += 24.0;
+            while (sunHour > 24.0)
+                sunHour -= 24.0;
 
+            while (sunHour < 0)
+                sunHour += 24.0;
 
-                World.RegionInfo.RegionSettings.UseEstateSun = useEstateSun;
-                World.RegionInfo.RegionSettings.SunPosition  = sunHour + 6; // LL Region Sun Hour is 6 to 30
-                World.RegionInfo.RegionSettings.FixedSun     = sunFixed;
-                World.RegionInfo.RegionSettings.Save();
+            World.RegionInfo.RegionSettings.UseEstateSun = useEstateSun;
+            World.RegionInfo.RegionSettings.SunPosition  = sunHour + 6; // LL Region Sun Hour is 6 to 30
+            World.RegionInfo.RegionSettings.FixedSun     = sunFixed;
+            World.RegionInfo.RegionSettings.Save();
 
-                World.EventManager.TriggerEstateToolsSunUpdate(World.RegionInfo.RegionHandle, sunFixed, useEstateSun, (float)sunHour);
-            }
+            World.EventManager.TriggerEstateToolsSunUpdate(
+                World.RegionInfo.RegionHandle, sunFixed, useEstateSun, (float)sunHour);
         }
 
         /// <summary>
@@ -1232,26 +1227,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <param name="sunHour">The "Sun Hour" that is desired, 0...24, with 0 just after SunRise</param>
         public void osSetEstateSunSettings(bool sunFixed, double sunHour)
         {
-            CheckThreatLevel(ThreatLevel.Nuisance, "osSetEstateSunSettings");
+            CheckThreatLevel(ThreatLevel.High, "osSetEstateSunSettings");
 
             m_host.AddScriptLPS(1);
-            //Check to make sure that the script's owner is the estate manager/master
-            //World.Permissions.GenericEstatePermission(
-            if (World.Permissions.IsGod(m_host.OwnerID))
-            {
-                while (sunHour > 24.0)
-                    sunHour -= 24.0;
 
-                while (sunHour < 0)
-                    sunHour += 24.0;
+            while (sunHour > 24.0)
+                sunHour -= 24.0;
 
-                World.RegionInfo.EstateSettings.UseGlobalTime = !sunFixed;
-                World.RegionInfo.EstateSettings.SunPosition = sunHour;
-                World.RegionInfo.EstateSettings.FixedSun = sunFixed;
-                World.RegionInfo.EstateSettings.Save();
+            while (sunHour < 0)
+                sunHour += 24.0;
 
-                World.EventManager.TriggerEstateToolsSunUpdate(World.RegionInfo.RegionHandle, sunFixed, World.RegionInfo.RegionSettings.UseEstateSun, (float)sunHour);
-            }
+            World.RegionInfo.EstateSettings.UseGlobalTime = !sunFixed;
+            World.RegionInfo.EstateSettings.SunPosition = sunHour;
+            World.RegionInfo.EstateSettings.FixedSun = sunFixed;
+            World.RegionInfo.EstateSettings.Save();
+
+            World.EventManager.TriggerEstateToolsSunUpdate(
+                World.RegionInfo.RegionHandle, sunFixed, World.RegionInfo.RegionSettings.UseEstateSun, (float)sunHour);
         }
 
         /// <summary>
@@ -1627,7 +1619,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public Object osParseJSONNew(string JSON)
         {
-            CheckThreatLevel(ThreatLevel.None, "osParseJSON");
+            CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
 
             m_host.AddScriptLPS(1);
 
@@ -2042,8 +2034,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             string nick = String.Empty;
             IConfigSource config = m_ScriptEngine.ConfigSource;
 
-            if (config.Configs["GridInfo"] != null)
-                nick = config.Configs["GridInfo"].GetString("gridnick", nick);
+            if (config.Configs[GridInfoServiceConfigSectionName] != null)
+                nick = config.Configs[GridInfoServiceConfigSectionName].GetString("gridnick", nick);
 
             if (String.IsNullOrEmpty(nick))
                 nick = GridUserInfo(InfoType.Nick);
@@ -2059,8 +2051,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             string name = String.Empty;
             IConfigSource config = m_ScriptEngine.ConfigSource;
 
-            if (config.Configs["GridInfo"] != null)
-                name = config.Configs["GridInfo"].GetString("gridname", name);
+            if (config.Configs[GridInfoServiceConfigSectionName] != null)
+                name = config.Configs[GridInfoServiceConfigSectionName].GetString("gridname", name);
 
             if (String.IsNullOrEmpty(name))
                 name = GridUserInfo(InfoType.Name);
@@ -2076,8 +2068,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             string loginURI = String.Empty;
             IConfigSource config = m_ScriptEngine.ConfigSource;
 
-            if (config.Configs["GridInfo"] != null)
-                loginURI = config.Configs["GridInfo"].GetString("login", loginURI);
+            if (config.Configs[GridInfoServiceConfigSectionName] != null)
+                loginURI = config.Configs[GridInfoServiceConfigSectionName].GetString("login", loginURI);
 
             if (String.IsNullOrEmpty(loginURI))
                 loginURI = GridUserInfo(InfoType.Login);
@@ -2124,8 +2116,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             string retval = String.Empty;
             IConfigSource config = m_ScriptEngine.ConfigSource;
 
-            if (config.Configs["GridInfo"] != null)
-                retval = config.Configs["GridInfo"].GetString(key, retval);
+            if (config.Configs[GridInfoServiceConfigSectionName] != null)
+                retval = config.Configs[GridInfoServiceConfigSectionName].GetString(key, retval);
 
             if (String.IsNullOrEmpty(retval))
                 retval = GridUserInfo(InfoType.Custom, key);
@@ -2480,7 +2472,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return;
                 
                 Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
-                module.MoveToTarget(npcId, World, pos, false, true);
+                module.MoveToTarget(npcId, World, pos, false, true, false);
             }
         }
 
@@ -2505,7 +2497,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     World,
                     pos,
                     (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
-                    (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0);
+                    (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0,
+                    (options & ScriptBaseClass.OS_NPC_RUNNING) != 0);
             }
         }
 
@@ -2555,7 +2548,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void osNpcStopMoveToTarget(LSL_Key npc)
         {
-            CheckThreatLevel(ThreatLevel.VeryLow, "osNpcStopMoveTo");
+            CheckThreatLevel(ThreatLevel.High, "osNpcStopMoveToTarget");
             m_host.AddScriptLPS(1);
 
             INPCModule module = World.RequestModuleInterface<INPCModule>();
@@ -2572,6 +2565,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void osNpcSay(LSL_Key npc, string message)
         {
+            osNpcSay(npc, 0, message);
+        }
+
+        public void osNpcSay(LSL_Key npc, int channel, string message)
+        {
             CheckThreatLevel(ThreatLevel.High, "osNpcSay");
             m_host.AddScriptLPS(1);
 
@@ -2583,7 +2581,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (!module.CheckPermissions(npcId, m_host.OwnerID))
                     return;
 
-                module.Say(npcId, World, message);
+                module.Say(npcId, World, message, channel);
+            }
+        }
+
+        public void osNpcShout(LSL_Key npc, int channel, string message)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcShout");
+            m_host.AddScriptLPS(1);
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcId = new UUID(npc.m_string);
+
+                if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                    return;
+
+                module.Shout(npcId, World, message, channel);
             }
         }
 
@@ -2684,6 +2699,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public void osNpcWhisper(LSL_Key npc, int channel, string message)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcWhisper");
+            m_host.AddScriptLPS(1);
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcId = new UUID(npc.m_string);
+
+                if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                    return;
+
+                module.Whisper(npcId, World, message, channel);
+            }
+        }
+
         /// <summary>
         /// Save the current appearance of the script owner permanently to the named notecard.
         /// </summary>
@@ -2835,21 +2867,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
             m_host.AddScriptLPS(1);
 
-            if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
+            World.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                World.ForEachRootScenePresence(delegate(ScenePresence sp)
+                if (sp.Firstname == FirstName && sp.Lastname == SurName)
                 {
-                    if (sp.Firstname == FirstName && sp.Lastname == SurName)
-                    {
-                        // kick client...
-                        if (alert != null)
-                            sp.ControllingClient.Kick(alert);
+                    // kick client...
+                    if (alert != null)
+                        sp.ControllingClient.Kick(alert);
 
-                        // ...and close on our side
-                        sp.Scene.IncomingCloseAgent(sp.UUID);
-                    }
-                });
-            }
+                    // ...and close on our side
+                    sp.Scene.IncomingCloseAgent(sp.UUID);
+                }
+            });
         }
         
         public void osCauseDamage(string avatar, double damage)
@@ -3095,5 +3124,80 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return ScriptBaseClass.TRUE;
         }
+
+        /// <summary>
+        /// Sets terrain estate texture
+        /// </summary>
+        /// <param name="level"></param>
+        /// <param name="texture"></param>
+        /// <returns></returns>
+        public void osSetTerrainTexture(int level, LSL_Key texture)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTexture");
+
+            m_host.AddScriptLPS(1);
+            //Check to make sure that the script's owner is the estate manager/master
+            //World.Permissions.GenericEstatePermission(
+            if (World.Permissions.IsGod(m_host.OwnerID))
+            {
+                if (level < 0 || level > 3)
+                    return;
+
+                UUID textureID = new UUID();
+                if (!UUID.TryParse(texture, out textureID))
+                    return;
+
+                // estate module is required
+                IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
+                if (estate != null)
+                    estate.setEstateTerrainBaseTexture(level, textureID);
+            }
+        }
+
+        /// <summary>
+        /// Sets terrain heights of estate
+        /// </summary>
+        /// <param name="corner"></param>
+        /// <param name="low"></param>
+        /// <param name="high"></param>
+        /// <returns></returns>
+        public void osSetTerrainTextureHeight(int corner, double low, double high)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTextureHeight");
+
+            m_host.AddScriptLPS(1);
+            //Check to make sure that the script's owner is the estate manager/master
+            //World.Permissions.GenericEstatePermission(
+            if (World.Permissions.IsGod(m_host.OwnerID))
+            {
+                if (corner < 0 || corner > 3)
+                    return;
+
+                // estate module is required
+                IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
+                if (estate != null)
+                    estate.setEstateTerrainTextureHeights(corner, (float)low, (float)high);
+            }
+        }
+
+        public void osForceAttachToAvatar(int attachmentPoint)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).AttachToAvatar(attachmentPoint);
+        }
+
+        public void osForceDetachFromAvatar()
+        {
+            CheckThreatLevel(ThreatLevel.High, "osForceDetachFromAvatar");
+
+            m_host.AddScriptLPS(1);
+
+            InitLSL();
+            ((LSL_Api)m_LSL_Api).DetachFromAvatar();
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 1373971..19f3ce1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -308,7 +308,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             }
             SceneObjectPart SensePoint = ts.host;
 
-            Vector3 fromRegionPos = SensePoint.AbsolutePosition;
+            Vector3 fromRegionPos = SensePoint.GetWorldPosition();
 
             // pre define some things to avoid repeated definitions in the loop body
             Vector3 toRegionPos;
@@ -323,13 +323,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             Quaternion q = SensePoint.GetWorldRotation();               // non-attached prim Sensor *always* uses World rotation!
             if (SensePoint.ParentGroup.IsAttachment)
             {
-                // In attachments, the sensor cone always orients with the
+                // In attachments, rotate the sensor cone with the
                 // avatar rotation. This may include a nonzero elevation if
                 // in mouselook.
+                // This will not include the rotation and position of the
+                // attachment point (e.g. your head when a sensor is in your
+                // hair attached to your scull. Your hair  will turn with
+                // your head but the sensor will stay with your (global)
+                // avatar rotation and position.
+                // Position of a sensor in a child prim attached to an avatar
+                // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
                 fromRegionPos = avatar.AbsolutePosition;
                 q = avatar.Rotation;
             }
+
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
             LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
             double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
@@ -441,14 +449,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 return sensedEntities;
 
             SceneObjectPart SensePoint = ts.host;
-            Vector3 fromRegionPos = SensePoint.AbsolutePosition;
+            Vector3 fromRegionPos = SensePoint.GetWorldPosition();
             
-            Quaternion q = SensePoint.RotationOffset;
+            Quaternion q = SensePoint.GetWorldRotation();
             if (SensePoint.ParentGroup.IsAttachment)
             {
-                // In attachments, the sensor cone always orients with the
+                // In attachments, rotate the sensor cone with the
                 // avatar rotation. This may include a nonzero elevation if
                 // in mouselook.
+                // This will not include the rotation and position of the
+                // attachment point (e.g. your head when a sensor is in your
+                // hair attached to your scull. Your hair  will turn with
+                // your head but the sensor will stay with your (global)
+                // avatar rotation and position.
+                // Position of a sensor in a child prim attached to an avatar
+                // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
                 if (avatar == null)
                     return sensedEntities;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index be5740e..048124d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -105,6 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        LSL_Integer llFloor(double f);
               void llForceMouselook(int mouselook);
          LSL_Float llFrand(double mag);
+           LSL_Key llGenerateKey();
         LSL_Vector llGetAccel();
        LSL_Integer llGetAgentInfo(string id);
         LSL_String llGetAgentLanguage(string id);
@@ -150,7 +151,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
       LSL_Rotation llGetLocalRot();
          LSL_Float llGetMass();
          LSL_Float llGetMassMKS();
-      void llGetNextEmail(string address, string subject);
+       LSL_Integer llGetMemoryLimit();
+              void llGetNextEmail(string address, string subject);
         LSL_String llGetNotecardLine(string name, int line);
            LSL_Key llGetNumberOfNotecardLines(string name);
        LSL_Integer llGetNumberOfPrims();
@@ -188,6 +190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetScriptName();
        LSL_Integer llGetScriptState(string name);
         LSL_String llGetSimulatorHostname();
+       LSL_Integer llGetSPMaxMemory();
        LSL_Integer llGetStartParameter();
        LSL_Integer llGetStatus(int status);
         LSL_String llGetSubString(string src, int start, int end);
@@ -323,6 +326,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSay(int channelID, string text);
               void llScaleTexture(double u, double v, int face);
        LSL_Integer llScriptDanger(LSL_Vector pos);
+              void llScriptProfiler(LSL_Integer flag);
            LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata);
               void llSensor(string name, string id, int type, double range, double arc);
               void llSensorRemove();
@@ -346,6 +350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetLinkTexture(int linknumber, string texture, int face);
               void llSetLinkTextureAnim(int linknum, int mode, int face, int sizex, int sizey, double start, double length, double rate);
               void llSetLocalRot(LSL_Rotation rot);
+       LSL_Integer llSetMemoryLimit(LSL_Integer limit);
               void llSetObjectDesc(string desc);
               void llSetObjectName(string name);
               void llSetObjectPermMask(int mask, int value);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 444a681..7382495 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -98,6 +98,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osAvatarPlayAnimation(string avatar, string animation);
         void osAvatarStopAnimation(string avatar, string animation);
 
+        // Attachment commands
+
+        /// <summary>
+        /// Attach the object containing this script to the avatar that owns it without checking for PERMISSION_ATTACH
+        /// </summary>
+        /// <param name='attachment'>The attachment point.  For example, ATTACH_CHEST</param>
+        void osForceAttachToAvatar(int attachment);
+
+        /// <summary>
+        /// Detach the object containing this script from the avatar it is attached to without checking for PERMISSION_ATTACH
+        /// </summary>
+        /// <remarks>Nothing happens if the object is not attached.</remarks>
+        void osForceDetachFromAvatar();
+
         //texture draw functions
         string osMovePen(string drawList, int x, int y);
         string osDrawLine(string drawList, int startX, int startY, int endX, int endY);
@@ -203,11 +217,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void        osNpcSetRot(LSL_Key npc, rotation rot);
         void        osNpcStopMoveToTarget(LSL_Key npc);
         void        osNpcSay(key npc, string message);
+        void        osNpcSay(key npc, int channel, string message);
+        void        osNpcShout(key npc, int channel, string message);
         void        osNpcSit(key npc, key target, int options);
         void        osNpcStand(LSL_Key npc);
         void        osNpcRemove(key npc);
         void        osNpcPlayAnimation(LSL_Key npc, string animation);
         void        osNpcStopAnimation(LSL_Key npc, string animation);
+        void        osNpcWhisper(key npc, int channel, string message);
 
         LSL_Key     osOwnerSaveAppearance(string notecard);
         LSL_Key     osAgentSaveAppearance(key agentId, string notecard);
@@ -234,5 +251,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         LSL_Integer osInviteToGroup(LSL_Key agentId);
         LSL_Integer osEjectFromGroup(LSL_Key agentId);
+
+        void osSetTerrainTexture(int level, LSL_Key texture);
+        void osSetTerrainTextureHeight(int corner, double low, double high);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 278f74e..5c6ad8a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -383,6 +383,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PRIM_SCULPT_FLAG_INVERT = 64;
         public const int PRIM_SCULPT_FLAG_MIRROR = 128;
 
+        public const int PROFILE_NONE = 0;
+        public const int PROFILE_SCRIPT_MEMORY = 1;
+
         public const int MASK_BASE = 0;
         public const int MASK_OWNER = 1;
         public const int MASK_GROUP = 2;
@@ -641,6 +644,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int OS_NPC_FLY = 0;
         public const int OS_NPC_NO_FLY = 1;
         public const int OS_NPC_LAND_AT_TARGET = 2;
+        public const int OS_NPC_RUNNING = 4;
 
         public const int OS_NPC_SIT_NOW = 0;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 9ba9561..2d23d30 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -376,6 +376,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llFrand(mag);
         }
 
+        public LSL_Key llGenerateKey()
+        {
+            return m_LSL_Functions.llGenerateKey();
+        }
+
         public LSL_Vector llGetAccel()
         {
             return m_LSL_Functions.llGetAccel();
@@ -591,6 +596,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetMassMKS();
         }
 
+        public LSL_Integer llGetMemoryLimit()
+        {
+            return m_LSL_Functions.llGetMemoryLimit();
+        }
+
         public void llGetNextEmail(string address, string subject)
         {
             m_LSL_Functions.llGetNextEmail(address, subject);
@@ -781,6 +791,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetSimulatorHostname();
         }
 
+        public LSL_Integer llGetSPMaxMemory()
+        {
+            return m_LSL_Functions.llGetSPMaxMemory();
+        }
+
         public LSL_Integer llGetStartParameter()
         {
             return m_LSL_Functions.llGetStartParameter();
@@ -1450,6 +1465,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llScriptDanger(pos);
         }
 
+        public void llScriptProfiler(LSL_Integer flags)
+        {
+            m_LSL_Functions.llScriptProfiler(flags);
+        }
+
         public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata)
         {
             return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata);
@@ -1560,6 +1580,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetLocalRot(rot);
         }
 
+        public LSL_Integer llSetMemoryLimit(LSL_Integer limit)
+        {
+            return m_LSL_Functions.llSetMemoryLimit(limit);
+        }
+
         public void llSetObjectDesc(string desc)
         {
             m_LSL_Functions.llSetObjectDesc(desc);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 680cefb4..d230662 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -289,8 +289,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osAvatarStopAnimation(avatar, animation);
         }
 
+        // Avatar functions
 
-        //Texture Draw functions
+        public void osForceAttachToAvatar(int attachmentPoint)
+        {
+            m_OSSL_Functions.osForceAttachToAvatar(attachmentPoint);
+        }
+
+        public void osForceDetachFromAvatar()
+        {
+            m_OSSL_Functions.osForceDetachFromAvatar();
+        }
+
+        // Texture Draw functions
 
         public string osMovePen(string drawList, int x, int y)
         {
@@ -569,6 +580,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osNpcSay(npc, message);
         }
 
+        public void osNpcSay(key npc, int channel, string message)
+        {
+            m_OSSL_Functions.osNpcSay(npc, channel, message);
+        }
+
+
+        public void osNpcShout(key npc, int channel, string message)
+        {
+            m_OSSL_Functions.osNpcShout(npc, channel, message);
+        }
+
         public void osNpcSit(LSL_Key npc, LSL_Key target, int options)
         {
             m_OSSL_Functions.osNpcSit(npc, target, options);
@@ -594,6 +616,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osNpcStopAnimation(npc, animation);
         }
 
+        public void osNpcWhisper(key npc, int channel, string message)
+        {
+            m_OSSL_Functions.osNpcWhisper(npc, channel, message);
+        }
+
         public LSL_Key osOwnerSaveAppearance(string notecard)
         {
             return m_OSSL_Functions.osOwnerSaveAppearance(notecard);
@@ -878,5 +905,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osEjectFromGroup(agentId);
         }
+
+        public void osSetTerrainTexture(int level, LSL_Key texture)
+        {
+            m_OSSL_Functions.osSetTerrainTexture(level, texture);
+        }
+
+        public void osSetTerrainTextureHeight(int corner, double low, double high)
+        {
+            m_OSSL_Functions.osSetTerrainTextureHeight(corner, low, high);
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index ff1f277..5cad883 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             foreach (string api in am.GetApis())
             {
                 m_Apis[api] = am.CreateApi(api);
-                m_Apis[api].Initialize(engine, part, LocalID, itemID);
+                m_Apis[api].Initialize(engine, part, ScriptTask);
             }
     
             try
@@ -964,7 +964,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         public IScriptApi GetApi(string name)
         {
             if (m_Apis.ContainsKey(name))
+            {
+//                m_log.DebugFormat("[SCRIPT INSTANCE]: Found api {0} in {1}@{2}", name, ScriptName, PrimName);
+
                 return m_Apis[name];
+            }
+
+//            m_log.DebugFormat("[SCRIPT INSTANCE]: Did not find api {0} in {1}@{2}", name, ScriptName, PrimName);
+
             return null;
         }
         
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index e2d0db2..c73e22f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             IConfig config = initConfigSource.AddConfig("XEngine");
             config.Set("Enabled", "true");
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
 
             m_engine = new XEngine.XEngine();
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TaskInventoryHelpers.AddSceneObject(m_scene, so1.RootPart, inventoryItemName, itemId, userId);
 
             LSL_Api api = new LSL_Api();
-            api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, so1.RootPart.UUID);
+            api.Initialize(m_engine, so1.RootPart, null);
 
             // Create a second object
             SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, userId, "so2", 0x100);
@@ -124,7 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
             m_scene.AddSceneObject(so1);
             LSL_Api api = new LSL_Api();
-            api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, so1.RootPart.UUID);
+            api.Initialize(m_engine, so1.RootPart, null);
 
             // Create an object embedded inside the first
             UUID itemId = TestHelpers.ParseTail(0x20);
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, user2Id, "so2", 0x100);
             m_scene.AddSceneObject(so2);
             LSL_Api api2 = new LSL_Api();
-            api2.Initialize(m_engine, so2.RootPart, so2.RootPart.LocalId, so2.RootPart.UUID);
+            api2.Initialize(m_engine, so2.RootPart, null);
 
             // *** Firstly, we test where llAllowInventoryDrop() has not been called. ***
             api.llGiveInventory(so2.UUID.ToString(), inventoryItemName);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
new file mode 100644
index 0000000..bc3b790
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -0,0 +1,139 @@
+/*
+ * 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 System.Text;
+using log4net;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.OptionalModules.World.NPC;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    /// <summary>
+    /// Tests for linking functions in LSL
+    /// </summary>
+    /// <remarks>
+    /// This relates to LSL.  Actual linking functionality should be tested in the main
+    /// OpenSim.Region.Framework.Scenes.Tests.SceneObjectLinkingTests.
+    /// </remarks>
+    [TestFixture]
+    public class LSL_ApiLinkingTests
+    {
+        protected Scene m_scene;
+        protected XEngine.XEngine m_engine;
+
+        [SetUp]
+        public void SetUp()
+        {
+            IConfigSource initConfigSource = new IniConfigSource();
+            IConfig config = initConfigSource.AddConfig("XEngine");
+            config.Set("Enabled", "true");
+
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
+
+            m_engine = new XEngine.XEngine();
+            m_engine.Initialise(initConfigSource);
+            m_engine.AddRegion(m_scene);
+        }
+
+        [Test]
+        public void TestllCreateLink()
+        {
+            TestHelpers.InMethod();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup grp1 = SceneHelpers.CreateSceneObject(2, ownerId, "grp1-", 0x10);
+            grp1.AbsolutePosition = new Vector3(10, 10, 10);
+            m_scene.AddSceneObject(grp1);
+
+            // FIXME: This should really be a script item (with accompanying script)
+            TaskInventoryItem grp1Item
+                = TaskInventoryHelpers.AddNotecard(m_scene, grp1.RootPart);
+            grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
+
+            SceneObjectGroup grp2 = SceneHelpers.CreateSceneObject(2, ownerId, "grp2-", 0x20);
+            grp2.AbsolutePosition = new Vector3(20, 20, 20);
+
+            // <180,0,0>
+            grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
+
+            m_scene.AddSceneObject(grp2);
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item);
+
+            apiGrp1.llCreateLink(grp2.UUID.ToString(), ScriptBaseClass.TRUE);
+
+            Assert.That(grp1.Parts.Length, Is.EqualTo(4));
+            Assert.That(grp2.IsDeleted, Is.True);
+        }
+
+        [Test]
+        public void TestllBreakLink()
+        {
+            TestHelpers.InMethod();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup grp1 = SceneHelpers.CreateSceneObject(2, ownerId, "grp1-", 0x10);
+            grp1.AbsolutePosition = new Vector3(10, 10, 10);
+            m_scene.AddSceneObject(grp1);
+
+            // FIXME: This should really be a script item (with accompanying script)
+            TaskInventoryItem grp1Item
+                = TaskInventoryHelpers.AddNotecard(m_scene, grp1.RootPart);
+            grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item);
+
+            apiGrp1.llBreakLink(2);
+
+            Assert.That(grp1.Parts.Length, Is.EqualTo(1));
+
+            SceneObjectGroup grp2 = m_scene.GetSceneObjectGroup("grp1-Part1");
+            Assert.That(grp2, Is.Not.Null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 9cf9258..f96a156 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             IConfig config = initConfigSource.AddConfig("XEngine");
             config.Set("Enabled", "true");
 
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
 
             XEngine.XEngine engine = new XEngine.XEngine();
@@ -66,8 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             engine.AddRegion(scene);
 
             m_lslApi = new LSL_Api();
-            m_lslApi.Initialize(engine, part, part.LocalId, part.UUID);
-
+            m_lslApi.Initialize(engine, part, null);
         }
 
         [Test]
@@ -261,7 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 
             // Create Prim1.
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
             string obj1Name = "Prim1";
             UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
             SceneObjectPart part1 =
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 7573dff..3965734 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             config = initConfigSource.AddConfig("NPC");
             config.Set("Enabled", "true");
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
 
             m_engine = new XEngine.XEngine();
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
 
@@ -202,7 +202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 9d9fc51..0ccd889 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             config = initConfigSource.AddConfig("NPC");
             config.Set("Enabled", "true");
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
 
             m_engine = new XEngine.XEngine();
@@ -104,10 +104,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(otherSo);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             OSSL_Api otherOsslApi = new OSSL_Api();
-            otherOsslApi.Initialize(m_engine, otherPart, otherPart.LocalId, otherPart.UUID);
+            otherOsslApi.Initialize(m_engine, otherPart, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
@@ -151,7 +151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             m_scene.AddSceneObject(so);
 
             OSSL_Api osslApi = new OSSL_Api();
-            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+            osslApi.Initialize(m_engine, part, null);
 
             string notecardName = "appearanceNc";
             osslApi.osOwnerSaveAppearance(notecardName);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index 7d7bd82..a3f848c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
             // to AssemblyResolver.OnAssemblyResolve fails.
             xEngineConfig.Set("AppDomainLoading", "false");
 
-            m_scene = SceneHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, null, configSource);
+            m_scene = new SceneHelpers().SetupScene("My Test", UUID.Random(), 1000, 1000, configSource);
             SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine, wcModule);
             m_scene.StartScripts();
         }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1e0f01f..eeb125e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1089,11 +1089,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                         AppDomain sandbox;
                         if (m_AppDomainLoading)
+                        {
                             sandbox = AppDomain.CreateDomain(
                                             m_Scene.RegionInfo.RegionID.ToString(),
                                             evidence, appSetup);
+                            m_AppDomains[appDomain].AssemblyResolve +=
+                                new ResolveEventHandler(
+                                    AssemblyResolver.OnAssemblyResolve);
+                        }
                         else
+                        {
                             sandbox = AppDomain.CurrentDomain;
+                        }
 
                         //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
                         //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
@@ -1105,9 +1112,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                         m_AppDomains[appDomain] = sandbox;
 
-                        m_AppDomains[appDomain].AssemblyResolve +=
-                            new ResolveEventHandler(
-                                AssemblyResolver.OnAssemblyResolve);
                         m_DomainScripts[appDomain] = new List<UUID>();
                     }
                     catch (Exception e)
@@ -1898,9 +1902,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         // if there already exists a file at that location, it may be locked.
                         m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
                     }
+
+                    string textpath = path + ".text";
                     try
                     {
-                        using (FileStream fs = File.Create(path + ".text"))
+                        using (FileStream fs = File.Create(textpath))
                         {
                             using (StreamWriter sw = new StreamWriter(fs))
                             {
@@ -1913,7 +1919,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     catch (IOException ex)
                     {
                         // if there already exists a file at that location, it may be locked.
-                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", textpath, ex.Message);
                     }
                 }
             }
@@ -1962,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 catch (IOException ex)
                 {
                     // if there already exists a file at that location, it may be locked.
-                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", mappath, ex.Message);
                 }
             }
 
@@ -1997,45 +2003,59 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     if (!topScripts.ContainsKey(si.LocalID))
                         topScripts[si.RootLocalID] = 0;
 
-//                    long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
-//                    float framesElapsed = ticksElapsed / (18.1818 * TimeSpan.TicksPerMillisecond);
-
-                    // Execution time of the script adjusted by it's measurement period to make scripts started at
-                    // different times comparable.
-//                    float adjustedExecutionTime
-//                        = (float)si.MeasurementPeriodExecutionTime
-//                            / ((float)(tickNow - si.MeasurementPeriodTickStart) / ScriptInstance.MaxMeasurementPeriod)
-//                            / TimeSpan.TicksPerMillisecond;
-
-                    long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
-
-                    // Avoid divide by zerp
-                    if (ticksElapsed == 0)
-                        ticksElapsed = 1;
+                    topScripts[si.RootLocalID] += CalculateAdjustedExectionTime(si, tickNow);
+                }
+            }
 
-                    // Scale execution time to the ideal 55 fps frame time for these reasons.
-                    //
-                    // 1) XEngine does not execute scripts per frame, unlike other script engines.  Hence, there is no
-                    // 'script execution time per frame', which is the original purpose of this value.
-                    //
-                    // 2) Giving the raw execution times is misleading since scripts start at different times, making
-                    // it impossible to compare scripts.
-                    //
-                    // 3) Scaling the raw execution time to the time that the script has been running is better but
-                    // is still misleading since a script that has just been rezzed may appear to have been running
-                    // for much longer.
-                    //
-                    // 4) Hence, we scale execution time to an idealised frame time (55 fps).  This is also not perfect
-                    // since the figure does not represent actual execution time and very hard running scripts will
-                    // never exceed 18ms (though this is a very high number for script execution so is a warning sign).
-                    float adjustedExecutionTime
-                        = ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
+            return topScripts;
+        }
 
-                    topScripts[si.RootLocalID] += adjustedExecutionTime;
+        public float GetScriptExecutionTime(List<UUID> itemIDs)
+        {
+            if (itemIDs == null|| itemIDs.Count == 0)
+            {
+                return 0.0f;
+            }
+            float time = 0.0f;
+            long tickNow = Util.EnvironmentTickCount();
+            IScriptInstance si;
+            // Calculate the time for all scripts that this engine is executing
+            // Ignore any others
+            foreach (UUID id in itemIDs)
+            {
+                si = GetInstance(id);
+                if (si != null && si.Running)
+                {
+                    time += CalculateAdjustedExectionTime(si, tickNow);
                 }
             }
+            return time;
+        }
 
-            return topScripts;
+        private float CalculateAdjustedExectionTime(IScriptInstance si, long tickNow)
+        {
+            long ticksElapsed = tickNow - si.MeasurementPeriodTickStart;
+
+            // Avoid divide by zero
+            if (ticksElapsed == 0)
+                ticksElapsed = 1;
+
+            // Scale execution time to the ideal 55 fps frame time for these reasons.
+            //
+            // 1) XEngine does not execute scripts per frame, unlike other script engines.  Hence, there is no
+            // 'script execution time per frame', which is the original purpose of this value.
+            //
+            // 2) Giving the raw execution times is misleading since scripts start at different times, making
+            // it impossible to compare scripts.
+            //
+            // 3) Scaling the raw execution time to the time that the script has been running is better but
+            // is still misleading since a script that has just been rezzed may appear to have been running
+            // for much longer.
+            //
+            // 4) Hence, we scale execution time to an idealised frame time (55 fps).  This is also not perfect
+            // since the figure does not represent actual execution time and very hard running scripts will
+            // never exceed 18ms (though this is a very high number for script execution so is a warning sign).
+            return ((float)si.MeasurementPeriodExecutionTime / ticksElapsed) * 18.1818f;
         }
 
         public void SuspendScript(UUID itemID)
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index b9ba4bc..faf746f 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.UserStatistics
 
                     dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
                     dbConn.Open();
-                    CheckAndUpdateDatabase(dbConn);
+                    CreateTables(dbConn);
 
                     Prototype_distributor protodep = new Prototype_distributor();
                     Updater_distributor updatedep = new Updater_distributor();
@@ -131,7 +131,7 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-        public void ReceiveClassicSimStatsPacket(SimStats stats)
+        private void ReceiveClassicSimStatsPacket(SimStats stats)
         {
             if (!enabled)
             {
@@ -163,7 +163,7 @@ namespace OpenSim.Region.UserStatistics
             }
         }
         
-        public Hashtable HandleUnknownCAPSRequest(Hashtable request)
+        private Hashtable HandleUnknownCAPSRequest(Hashtable request)
         {
             //string regpath = request["uri"].ToString();
             int response_code = 200;
@@ -178,7 +178,7 @@ namespace OpenSim.Region.UserStatistics
             return responsedata;
         }
 
-        public Hashtable HandleStatsRequest(Hashtable request)
+        private Hashtable HandleStatsRequest(Hashtable request)
         {
             lastHit = System.Environment.TickCount;
             Hashtable responsedata = new Hashtable();
@@ -237,36 +237,12 @@ namespace OpenSim.Region.UserStatistics
 
             return responsedata;
         }
-       
-        public void CheckAndUpdateDatabase(SqliteConnection db)
-        {
-            lock (db)
-            {
-                // TODO: FIXME: implement stats migrations
-                const string SQL = @"SELECT * FROM migrations LIMIT 1";
-
-                using (SqliteCommand cmd = new SqliteCommand(SQL, db))
-                {
-                    try
-                    {
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (SqliteSyntaxException)
-                    {
-                        CreateTables(db);
-                    }
-                }
-            }
-        }
 
-        public void CreateTables(SqliteConnection db)
+        private void CreateTables(SqliteConnection db)
         {
             using (SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db))
             {
                 createcmd.ExecuteNonQuery();
-
-                createcmd.CommandText = SQL_MIGRA_TABLE_CREATE;
-                createcmd.ExecuteNonQuery();
             }
         }
 
@@ -301,22 +277,23 @@ namespace OpenSim.Region.UserStatistics
             get { return true; }
         }
 
-        public void OnRegisterCaps(UUID agentID, Caps caps)
+        private void OnRegisterCaps(UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
 
             string capsPath = "/CAPS/VS/" + UUID.Random();
-            caps.RegisterHandler("ViewerStats",
-                                 new RestStreamHandler("POST", capsPath,
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
-                                                           return ViewerStatsReport(request, path, param,
-                                                                                  agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "ViewerStats",
+                new RestStreamHandler(
+                    "POST",
+                    capsPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ViewerStatsReport(request, path, param, agentID, caps),
+                    "ViewerStats",
+                    agentID.ToString()));
         }
 
-        public void OnDeRegisterCaps(UUID agentID, Caps caps)
+        private void OnDeRegisterCaps(UUID agentID, Caps caps)
         {
         }
 
@@ -336,7 +313,7 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-        public void OnMakeRootAgent(ScenePresence agent)
+        private void OnMakeRootAgent(ScenePresence agent)
         {
             UUID regionUUID = GetRegionUUIDFromHandle(agent.RegionHandle);
 
@@ -365,11 +342,11 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-        public void OnMakeChildAgent(ScenePresence agent)
+        private void OnMakeChildAgent(ScenePresence agent)
         {
         }
 
-        public void OnClientClosed(UUID agentID, Scene scene)
+        private void OnClientClosed(UUID agentID, Scene scene)
         {
             lock (m_sessions)
             {
@@ -380,7 +357,7 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-        public string readLogLines(int amount)
+        private string readLogLines(int amount)
         {
             Encoding encoding = Encoding.ASCII;
             int sizeOfChar = encoding.GetByteCount("\n");
@@ -418,7 +395,7 @@ namespace OpenSim.Region.UserStatistics
             return encoding.GetString(buffer);
         }
 
-        public UUID GetRegionUUIDFromHandle(ulong regionhandle)
+        private UUID GetRegionUUIDFromHandle(ulong regionhandle)
         {
             lock (m_scenes)
             {
@@ -441,17 +418,17 @@ namespace OpenSim.Region.UserStatistics
         /// <param name="agentID"></param>
         /// <param name="caps"></param>
         /// <returns></returns>
-        public string ViewerStatsReport(string request, string path, string param,
+        private string ViewerStatsReport(string request, string path, string param,
                                       UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat("[WEB STATS MODULE]: Received viewer starts report from {0}", agentID);
  
-            UpdateUserStats(ParseViewerStats(request,agentID), dbConn);
+            UpdateUserStats(ParseViewerStats(request, agentID), dbConn);
 
             return String.Empty;
         }
 
-        public UserSessionID ParseViewerStats(string request, UUID agentID)
+        private UserSessionID ParseViewerStats(string request, UUID agentID)
         {
             UserSessionID uid = new UserSessionID();
             UserSessionData usd;
@@ -592,14 +569,14 @@ namespace OpenSim.Region.UserStatistics
             return uid;
         }
 
-        public void UpdateUserStats(UserSessionID uid, SqliteConnection db)
+        private void UpdateUserStats(UserSessionID uid, SqliteConnection db)
         {
             if (uid.session_id == UUID.Zero)
                 return;
 
             lock (db)
             {
-                using (SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_UPDATE, db))
+                using (SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_INSERT, db))
                 {
                     updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
                     updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
@@ -648,44 +625,26 @@ namespace OpenSim.Region.UserStatistics
                     updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
                     updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
                     updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
-    
                     updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
                     updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
                     updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
-    
-                    updatecmd.Parameters.Add(new SqliteParameter(":session_key", uid.session_data.session_id.ToString()));
-                    updatecmd.Parameters.Add(new SqliteParameter(":agent_key", uid.session_data.agent_id.ToString()));
-                    updatecmd.Parameters.Add(new SqliteParameter(":region_key", uid.session_data.region_id.ToString()));
 
-//                    m_log.DebugFormat("[WEB STATS MODULE]: Database stats update for {0}", uid.session_data.agent_id);
-
-                    int result = updatecmd.ExecuteNonQuery();
-
-                    if (result == 0)
-                    {
-//                        m_log.DebugFormat("[WEB STATS MODULE]: Database stats insert for {0}", uid.session_data.agent_id);
+//                        StringBuilder parameters = new StringBuilder();
+//                        SqliteParameterCollection spc = updatecmd.Parameters;
+//                        foreach (SqliteParameter sp in spc)
+//                            parameters.AppendFormat("{0}={1},", sp.ParameterName, sp.Value);
+//
+//                        m_log.DebugFormat("[WEB STATS MODULE]: Parameters {0}", parameters);
 
-                        updatecmd.CommandText = SQL_STATS_TABLE_INSERT;
+//                    m_log.DebugFormat("[WEB STATS MODULE]: Database stats update for {0}", uid.session_data.agent_id);
 
-                        try
-                        {
-                            updatecmd.ExecuteNonQuery();
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.WarnFormat(
-                                "[WEB STATS MODULE]: failed to write stats for {0}, storage Execution Exception {1}{2}",
-                                uid.session_data.agent_id, e.Message, e.StackTrace);
-                        }
-                    }
+                    updatecmd.ExecuteNonQuery();
                 }
             }
         }
 
         #region SQL
-        private const string SQL_MIGRA_TABLE_CREATE = @"create table migrations(name varchar(100), version int)";
-
-        private const string SQL_STATS_TABLE_CREATE = @"CREATE TABLE stats_session_data (
+        private const string SQL_STATS_TABLE_CREATE = @"CREATE TABLE IF NOT EXISTS stats_session_data (
                session_id VARCHAR(36) NOT NULL PRIMARY KEY,
                agent_id VARCHAR(36) NOT NULL DEFAULT '',
                region_id VARCHAR(36) NOT NULL DEFAULT '',
@@ -735,11 +694,11 @@ namespace OpenSim.Region.UserStatistics
                f_send_packet INT NOT NULL DEFAULT '0'
             );";
 
-        private const string SQL_STATS_TABLE_INSERT = @"INSERT INTO stats_session_data (
+        private const string SQL_STATS_TABLE_INSERT = @"INSERT OR REPLACE INTO stats_session_data (
 session_id, agent_id, region_id, last_updated, remote_ip, name_f, name_l, avg_agents_in_view, min_agents_in_view, max_agents_in_view, 
 mode_agents_in_view, avg_fps, min_fps, max_fps, mode_fps, a_language, mem_use, meters_traveled, avg_ping, min_ping, max_ping, mode_ping, 
 regions_visited, run_time, avg_sim_fps, min_sim_fps, max_sim_fps, mode_sim_fps, start_time, client_version, s_cpu, s_gpu, s_os, s_ram,
-d_object_kb, d_texture_kb, n_in_kb, n_in_pk, n_out_kb, n_out_pk, f_dropped, f_failed_resends, f_invalid, f_invalid, f_off_circuit,
+d_object_kb, d_texture_kb, d_world_kb, n_in_kb, n_in_pk, n_out_kb, n_out_pk, f_dropped, f_failed_resends, f_invalid, f_off_circuit,
 f_resent, f_send_packet
 )
 VALUES
@@ -747,62 +706,13 @@ VALUES
 :session_id, :agent_id, :region_id, :last_updated, :remote_ip, :name_f, :name_l, :avg_agents_in_view, :min_agents_in_view, :max_agents_in_view, 
 :mode_agents_in_view, :avg_fps, :min_fps, :max_fps, :mode_fps, :a_language, :mem_use, :meters_traveled, :avg_ping, :min_ping, :max_ping, :mode_ping, 
 :regions_visited, :run_time, :avg_sim_fps, :min_sim_fps, :max_sim_fps, :mode_sim_fps, :start_time, :client_version, :s_cpu, :s_gpu, :s_os, :s_ram,
-:d_object_kb, :d_texture_kb, :n_in_kb, :n_in_pk, :n_out_kb, :n_out_pk, :f_dropped, :f_failed_resends, :f_invalid, :f_invalid, :f_off_circuit,
+:d_object_kb, :d_texture_kb, :d_world_kb, :n_in_kb, :n_in_pk, :n_out_kb, :n_out_pk, :f_dropped, :f_failed_resends, :f_invalid, :f_off_circuit,
 :f_resent, :f_send_packet
 )
 ";
 
-        private const string SQL_STATS_TABLE_UPDATE = @"
-UPDATE stats_session_data 
-set session_id=:session_id,
-    agent_id=:agent_id,
-    region_id=:region_id,
-    last_updated=:last_updated,
-    remote_ip=:remote_ip,
-    name_f=:name_f,
-    name_l=:name_l,
-    avg_agents_in_view=:avg_agents_in_view,
-    min_agents_in_view=:min_agents_in_view,
-    max_agents_in_view=:max_agents_in_view,
-    mode_agents_in_view=:mode_agents_in_view,
-    avg_fps=:avg_fps,
-    min_fps=:min_fps,
-    max_fps=:max_fps,
-    mode_fps=:mode_fps,
-    a_language=:a_language,
-    mem_use=:mem_use,
-    meters_traveled=:meters_traveled,
-    avg_ping=:avg_ping,
-    min_ping=:min_ping,
-    max_ping=:max_ping,
-    mode_ping=:mode_ping,
-    regions_visited=:regions_visited,
-    run_time=:run_time,
-    avg_sim_fps=:avg_sim_fps,
-    min_sim_fps=:min_sim_fps,
-    max_sim_fps=:max_sim_fps,
-    mode_sim_fps=:mode_sim_fps,
-    start_time=:start_time,
-    client_version=:client_version,
-    s_cpu=:s_cpu,
-    s_gpu=:s_gpu,
-    s_os=:s_os,
-    s_ram=:s_ram,
-    d_object_kb=:d_object_kb,
-    d_texture_kb=:d_texture_kb,
-    d_world_kb=:d_world_kb,
-    n_in_kb=:n_in_kb,
-    n_in_pk=:n_in_pk,
-    n_out_kb=:n_out_kb,
-    n_out_pk=:n_out_pk,
-    f_dropped=:f_dropped,
-    f_failed_resends=:f_failed_resends,
-    f_invalid=:f_invalid,
-    f_off_circuit=:f_off_circuit,
-    f_resent=:f_resent,
-    f_send_packet=:f_send_packet
-WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key";
-        #endregion
+    #endregion
+
     }
 
     public static class UserSessionUtil
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 8effdd2..42c82cf 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -117,7 +117,10 @@ namespace OpenSim.Server.Base
                             catch (Exception e)
                             {
                                 if (!(e is System.MissingMethodException))
-                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                {
+                                    m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}",
+                                        interfaceName, dllName, e.InnerException == null ? e.Message : e.InnerException.Message);
+                                }
                                 return null;
                             }
 
@@ -265,7 +268,7 @@ namespace OpenSim.Server.Base
                     continue;
 
                 XmlElement elem = parent.OwnerDocument.CreateElement("",
-                        kvp.Key, "");
+                        XmlConvert.EncodeLocalName(kvp.Key), "");
 
                 if (kvp.Value is Dictionary<string, object>)
                 {
@@ -320,11 +323,11 @@ namespace OpenSim.Server.Base
                 XmlNode type = part.Attributes.GetNamedItem("type");
                 if (type == null || type.Value != "List")
                 {
-                    ret[part.Name] = part.InnerText;
+                    ret[XmlConvert.DecodeName(part.Name)] = part.InnerText;
                 }
                 else
                 {
-                    ret[part.Name] = ParseElement(part);
+                    ret[XmlConvert.DecodeName(part.Name)] = ParseElement(part);
                 }
             }
 
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index dfed761..18cef15 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -191,6 +191,8 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
 
         #endregion HTML
 
+        public string Name { get { return "OpenId"; } }
+        public string Description { get { return null; } }
         public string ContentType { get { return m_contentType; } }
         public string HttpMethod { get { return m_httpMethod; } }
         public string Path { get { return m_path; } }
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
index 59420f5..ef9b96f 100644
--- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
@@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.Friends
                         return DeleteFriendString(request);
 
                 }
-                m_log.DebugFormat("[FRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
+
+                m_log.DebugFormat("[FRIENDS HANDLER]: unknown method request {0}", method);
             }
             catch (Exception e)
             {
@@ -103,7 +104,6 @@ namespace OpenSim.Server.Handlers.Friends
             }
 
             return FailureResult();
-
         }
 
         #region Method-specific handlers
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index bebf482..91d14cb 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Server.Handlers.Grid
                         return GetRegionFlags(request);
                 }
                 
-                m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method);
+                m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 8ef03e7..c2f127c 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -122,7 +122,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
                         return GrantRights(request);
                         */
                 }
-                m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
+                
+                m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 75dd711..4a61969 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -33,17 +33,24 @@ using System.Xml;
 
 using Nini.Config;
 using log4net;
+using OpenMetaverse;
 
+using OpenSim.Framework;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 namespace OpenSim.Server.Handlers.MapImage
 {
     public class MapAddServiceConnector : ServiceConnector
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IMapImageService m_MapService;
+        private IGridService m_GridService;
         private string m_ConfigName = "MapImageService";
 
         public MapAddServiceConnector(IConfigSource config, IHttpServer server, string configName) :
@@ -53,16 +60,27 @@ namespace OpenSim.Server.Handlers.MapImage
             if (serverConfig == null)
                 throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-            string gridService = serverConfig.GetString("LocalServiceModule",
+            string mapService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
-            if (gridService == String.Empty)
+            if (mapService == String.Empty)
                 throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
-            m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args);
+            m_MapService = ServerUtils.LoadPlugin<IMapImageService>(mapService, args);
+
+            string gridService = serverConfig.GetString("GridService", String.Empty);
+            if (gridService != string.Empty)
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+
+            if (m_GridService != null)
+                m_log.InfoFormat("[MAP IMAGE HANDLER]: GridService check is ON");
+            else
+                m_log.InfoFormat("[MAP IMAGE HANDLER]: GridService check is OFF");
+
+            bool proxy = serverConfig.GetBoolean("HasProxy", false);
+            server.AddStreamHandler(new MapServerPostHandler(m_MapService, m_GridService, proxy));
 
-            server.AddStreamHandler(new MapServerPostHandler(m_MapService));
         }
     }
 
@@ -70,11 +88,15 @@ namespace OpenSim.Server.Handlers.MapImage
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private IMapImageService m_MapService;
+        private IGridService m_GridService;
+        bool m_Proxy;
 
-        public MapServerPostHandler(IMapImageService service) :
+        public MapServerPostHandler(IMapImageService service, IGridService grid, bool proxy) :
             base("POST", "/map")
         {
             m_MapService = service;
+            m_GridService = grid;
+            m_Proxy = proxy;
         }
 
         public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
@@ -105,6 +127,27 @@ namespace OpenSim.Server.Handlers.MapImage
 //                if (request.ContainsKey("TYPE"))
 //                    type = request["TYPE"].ToString();
 
+                if (m_GridService != null)
+                {
+                    System.Net.IPAddress ipAddr = GetCallerIP(httpRequest);
+                    GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, x * (int)Constants.RegionSize, y * (int)Constants.RegionSize);
+                    if (r != null)
+                    {
+                        if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
+                        {
+                            m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be trying to impersonate region in IP {1}", ipAddr, r.ExternalEndPoint.Address);
+                            return FailureResult("IP address of caller does not match IP address of registered region");
+                        }
+
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", 
+                            ipAddr, x, y);
+                        return FailureResult("Region not found at given coordinates");
+                    }
+                }
+
                 byte[] data = Convert.FromBase64String(request["DATA"].ToString());
 
                 string reason = string.Empty;
@@ -183,5 +226,31 @@ namespace OpenSim.Server.Handlers.MapImage
 
             return ms.ToArray();
         }
+
+        private System.Net.IPAddress GetCallerIP(IOSHttpRequest request)
+        {
+            if (!m_Proxy)
+                return request.RemoteIPEndPoint.Address;
+
+            // We're behind a proxy
+            string xff = "X-Forwarded-For";
+            string xffValue = request.Headers[xff.ToLower()];
+            if (xffValue == null || (xffValue != null && xffValue == string.Empty))
+                xffValue = request.Headers[xff];
+
+            if (xffValue == null || (xffValue != null && xffValue == string.Empty))
+            {
+                m_log.WarnFormat("[MAP IMAGE HANDLER]: No XFF header");
+                return request.RemoteIPEndPoint.Address;
+            }
+
+            System.Net.IPEndPoint ep = Util.GetClientIPFromXFF(xffValue);
+            if (ep != null)
+                return ep.Address;
+
+            // Oops
+            return request.RemoteIPEndPoint.Address;
+        }
+
     }
 }
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs
index c59a9e0..423c781 100644
--- a/OpenSim/Services/AvatarService/AvatarService.cs
+++ b/OpenSim/Services/AvatarService/AvatarService.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.AvatarService
                 if (kvp.Key.StartsWith("_"))
                     count++;
 
-            m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count);
+//            m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count);
             m_Database.Delete("PrincipalID", principalID.ToString());
 
             AvatarBaseData av = new AvatarBaseData();
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 2882906..2882906 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
index 2b77154..2b77154 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
index 35b7109..35b7109 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
index ddfca57..ddfca57 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index b1dd84e..b1dd84e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 7deaf95..f982cc1 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -116,29 +116,36 @@ namespace OpenSim.Services.Connectors
                     }
                     else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure"))
                     {
-                        m_log.DebugFormat("[GRID CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString());
+                        m_log.ErrorFormat(
+                            "[GRID CONNECTOR]: Registration failed: {0} when contacting {1}", replyData["Message"], uri);
+
                         return replyData["Message"].ToString();
                     }
                     else if (!replyData.ContainsKey("Result"))
                     {
-                        m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field");
+                        m_log.ErrorFormat(
+                            "[GRID CONNECTOR]: reply data does not contain result field when contacting {0}", uri);
                     }
                     else
                     {
-                        m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
-                        return "Unexpected result "+replyData["Result"].ToString();
+                        m_log.ErrorFormat(
+                            "[GRID CONNECTOR]: unexpected result {0} when contacting {1}", replyData["Result"], uri);
+
+                        return "Unexpected result " + replyData["Result"].ToString();
                     }
-                    
                 }
                 else
-                    m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply");
+                {
+                    m_log.ErrorFormat(
+                        "[GRID CONNECTOR]: RegisterRegion received null reply when contacting grid server at {0}", uri);
+                }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
+                m_log.ErrorFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
             }
 
-            return "Error communicating with grid service";
+            return string.Format("Error communicating with the grid service at {0}", uri);
         }
 
         public bool DeregisterRegion(UUID regionID)
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index 20d7eaf..20d7eaf 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index bc0bc54..4cd933c 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -154,17 +154,32 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
             UUID mapTile = m_HGMapImage;
             string filename = string.Empty;
-            Bitmap bitmap = null;
+
             try
             {
                 WebClient c = new WebClient();
                 //m_log.Debug("JPEG: " + imageURL);
                 string name = regionID.ToString();
                 filename = Path.Combine(storagePath, name + ".jpg");
-                c.DownloadFile(imageURL, filename);
-                bitmap = new Bitmap(filename);
-                //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
-                byte[] imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename);
+                if (!File.Exists(filename))
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: downloading...");
+                    c.DownloadFile(imageURL, filename);
+                }
+                else
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: using cached image");
+                }
+
+                byte[] imageData = null;
+
+                using (Bitmap bitmap = new Bitmap(filename))
+                {
+                    //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
+                    imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                }
+                
                 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());
 
                 // !!! for now
diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
index e984a54..e984a54 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index 5c50936..5c50936 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index 9d96703..9d96703 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 833e22a..833e22a 100644
--- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index 30bfb70..30bfb70 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 888b072..888b072 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index 378aab6..378aab6 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 5731e2f..5731e2f 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index b6ec558..53fbea6 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -107,9 +107,8 @@ namespace OpenSim.Services.HypergridService
         public override List<InventoryFolderBase> GetInventorySkeleton(UUID principalID)
         {
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
-            XInventoryFolder root = GetRootXFolder(principalID);
 
-            List<XInventoryFolder> tree = GetFolderTree(suitcase.folderID);
+            List<XInventoryFolder> tree = GetFolderTree(principalID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
                 return null;
 
@@ -119,7 +118,7 @@ namespace OpenSim.Services.HypergridService
                 folders.Add(ConvertToOpenSim(x));
             }
 
-            SetAsRootFolder(suitcase, root);
+            SetAsNormalFolder(suitcase);
             folders.Add(ConvertToOpenSim(suitcase));
 
             return folders;
@@ -134,12 +133,11 @@ namespace OpenSim.Services.HypergridService
             userInventory.Items = new List<InventoryItemBase>();
 
             XInventoryFolder suitcase = GetSuitcaseXFolder(userID);
-            XInventoryFolder root = GetRootXFolder(userID);
 
-            List<XInventoryFolder> tree = GetFolderTree(suitcase.folderID);
+            List<XInventoryFolder> tree = GetFolderTree(userID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
             {
-                SetAsRootFolder(suitcase, root);
+                SetAsNormalFolder(suitcase);
                 userInventory.Folders.Add(ConvertToOpenSim(suitcase));
                 return userInventory;
             }
@@ -164,7 +162,7 @@ namespace OpenSim.Services.HypergridService
                 userInventory.Items.AddRange(items);
             }
 
-            SetAsRootFolder(suitcase, root);
+            SetAsNormalFolder(suitcase);
             userInventory.Folders.Add(ConvertToOpenSim(suitcase));
 
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetUserInventory for user {0} returning {1} folders and {2} items",
@@ -175,14 +173,13 @@ namespace OpenSim.Services.HypergridService
         public override InventoryFolderBase GetRootFolder(UUID principalID)
         {
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
-            if (m_Database == null)
-                m_log.ErrorFormat("[XXX]: m_Database is NULL!");
 
             // Let's find out the local root folder
             XInventoryFolder root = GetRootXFolder(principalID); ;
             if (root == null)
             {
                 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve local root folder for user {0}", principalID);
+                return null;
             }
 
             // Warp! Root folder for travelers is the suitcase folder
@@ -202,7 +199,7 @@ namespace OpenSim.Services.HypergridService
                 CreateSystemFolders(principalID, suitcase.folderID);
             }
 
-            SetAsRootFolder(suitcase, root);
+            SetAsNormalFolder(suitcase);
 
             return ConvertToOpenSim(suitcase);
         }
@@ -271,9 +268,8 @@ namespace OpenSim.Services.HypergridService
         public override InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
         {
             InventoryCollection coll = null;
-            XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
 
-            if (!IsWithinSuitcaseTree(folderID, suitcase))
+            if (!IsWithinSuitcaseTree(principalID, folderID))
                 return new InventoryCollection();
 
             coll = base.GetFolderContent(principalID, folderID);
@@ -290,9 +286,7 @@ namespace OpenSim.Services.HypergridService
         {
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder exists under the suitcase tree of this user
-            XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
-
-            if (!IsWithinSuitcaseTree(folderID, suitcase))
+            if (!IsWithinSuitcaseTree(principalID, folderID))
                 return new List<InventoryItemBase>();
 
             return base.GetFolderItems(principalID, folderID);
@@ -303,21 +297,27 @@ namespace OpenSim.Services.HypergridService
             m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder's parent folder exists under the suitcase tree of this user
-            XInventoryFolder suitcase = GetSuitcaseXFolder(folder.Owner);
 
-            if (!IsWithinSuitcaseTree(folder.ParentID, suitcase))
+            if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
                 return false;
 
             // OK, it's legit
-            return base.AddFolder(folder);
+            if (base.AddFolder(folder))
+            {
+                List<XInventoryFolder> tree;
+                if (m_SuitcaseTrees.TryGetValue(folder.Owner, out tree))
+                    tree.Add(ConvertFromOpenSim(folder));
+
+                return true;
+            }
+
+            return false;
         }
 
         public override bool UpdateFolder(InventoryFolderBase folder)
         {
-            XInventoryFolder suitcase = GetSuitcaseXFolder(folder.Owner);
-
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
-            if (!IsWithinSuitcaseTree(folder.ID, suitcase))
+            if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name);
                 return false;
@@ -329,9 +329,8 @@ namespace OpenSim.Services.HypergridService
 
         public override bool MoveFolder(InventoryFolderBase folder)
         {
-            XInventoryFolder suitcase = GetSuitcaseXFolder(folder.Owner);
-
-            if (!IsWithinSuitcaseTree(folder.ID, suitcase) || !IsWithinSuitcaseTree(folder.ParentID, suitcase))
+            if (!IsWithinSuitcaseTree(folder.Owner, folder.ID) || 
+                !IsWithinSuitcaseTree(folder.Owner, folder.ParentID))
                 return false;
 
             return base.MoveFolder(folder);
@@ -353,9 +352,7 @@ namespace OpenSim.Services.HypergridService
         {
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder's parent folder exists under the suitcase tree of this user
-            XInventoryFolder suitcase = GetSuitcaseXFolder(item.Owner);
-
-            if (!IsWithinSuitcaseTree(item.Folder, suitcase))
+            if (!IsWithinSuitcaseTree(item.Owner, item.Folder))
                 return false;
 
             // OK, it's legit
@@ -365,9 +362,7 @@ namespace OpenSim.Services.HypergridService
 
         public override bool UpdateItem(InventoryItemBase item)
         {
-            XInventoryFolder suitcase = GetSuitcaseXFolder(item.Owner);
-
-            if (!IsWithinSuitcaseTree(item.Folder, suitcase))
+            if (!IsWithinSuitcaseTree(item.Owner, item.Folder))
                 return false;
 
             return base.UpdateItem(item);
@@ -377,9 +372,7 @@ namespace OpenSim.Services.HypergridService
         {
             // Principal is b0rked. *sigh*
 
-            XInventoryFolder suitcase = GetSuitcaseXFolder(items[0].Owner);
-
-            if (!IsWithinSuitcaseTree(items[0].Folder, suitcase))
+            if (!IsWithinSuitcaseTree(items[0].Owner, items[0].Folder))
                 return false;
 
             return base.MoveItems(principalID, items);
@@ -400,15 +393,8 @@ namespace OpenSim.Services.HypergridService
                     item.Name, item.ID, item.Folder);
                 return null;
             }
-            XInventoryFolder suitcase = GetSuitcaseXFolder(it.Owner);
-            if (suitcase == null)
-            {
-                m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Root or Suitcase are null for user {0}",
-                    it.Owner);
-                return null;
-            }
 
-            if (!IsWithinSuitcaseTree(it.Folder, suitcase))
+            if (!IsWithinSuitcaseTree(it.Owner, it.Folder))
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Item {0} (folder {1}) is not within Suitcase",
                     it.Name, it.Folder);
@@ -431,9 +417,7 @@ namespace OpenSim.Services.HypergridService
 
             if (f != null)
             {
-                XInventoryFolder suitcase = GetSuitcaseXFolder(f.Owner);
-
-                if (!IsWithinSuitcaseTree(f.ID, suitcase))
+                if (!IsWithinSuitcaseTree(f.Owner, f.ID))
                     return null;
             }
 
@@ -481,22 +465,37 @@ namespace OpenSim.Services.HypergridService
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
+            
+            // check to see if we have the old Suitcase folder
+            folders = m_Database.GetFolders(
+                    new string[] { "agentID", "folderName", "parentFolderID" },
+                    new string[] { principalID.ToString(), "My Suitcase", UUID.Zero.ToString() });
+            if (folders != null && folders.Length > 0)
+            {
+                // Move it to under the root folder
+                XInventoryFolder root = GetRootXFolder(principalID);
+                folders[0].parentFolderID = root.folderID;
+                folders[0].type = 100;
+                m_Database.StoreFolder(folders[0]);
+                return folders[0];
+            }
+
             return null;
         }
 
-        private void SetAsRootFolder(XInventoryFolder suitcase, XInventoryFolder root)
+        private void SetAsNormalFolder(XInventoryFolder suitcase)
         {
             suitcase.type = (short)AssetType.Folder;
         }
 
-        private List<XInventoryFolder> GetFolderTree(UUID folder)
+        private List<XInventoryFolder> GetFolderTree(UUID principalID, UUID folder)
         {
             List<XInventoryFolder> t = null;
-            if (m_SuitcaseTrees.TryGetValue(folder, out t))
+            if (m_SuitcaseTrees.TryGetValue(principalID, out t))
                 return t;
 
             t = GetFolderTreeRecursive(folder);
-            m_SuitcaseTrees.AddOrUpdate(folder, t, 120);
+            m_SuitcaseTrees.AddOrUpdate(principalID, t, 5*60); // 5minutes
             return t;
         }
 
@@ -528,11 +527,18 @@ namespace OpenSim.Services.HypergridService
         /// <param name="root"></param>
         /// <param name="suitcase"></param>
         /// <returns></returns>
-        private bool IsWithinSuitcaseTree(UUID folderID, XInventoryFolder suitcase)
+        private bool IsWithinSuitcaseTree(UUID principalID, UUID folderID)
         {
+            XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: User {0} does not have a Suitcase folder", principalID);
+                return false;
+            }
+
             List<XInventoryFolder> tree = new List<XInventoryFolder>();
             tree.Add(suitcase); // Warp! the tree is the real root folder plus the children of the suitcase folder
-            tree.AddRange(GetFolderTree(suitcase.folderID));
+            tree.AddRange(GetFolderTree(principalID, suitcase.folderID));
             XInventoryFolder f = tree.Find(delegate(XInventoryFolder fl)
             {
                 if (fl.folderID == folderID) return true;
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 0e7a358..15156d0 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Services.InventoryService
             : this(config, "InventoryService")
         {
         }
+
         public XInventoryService(IConfigSource config, string configName) : base(config)
         {
             if (configName != string.Empty)
@@ -364,6 +365,11 @@ namespace OpenSim.Services.InventoryService
         //
         public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
         {
+            return DeleteFolders(principalID, folderIDs, true);
+        }
+
+        public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs, bool onlyIfTrash)
+        {
             if (!m_AllowDelete)
                 return false;
 
@@ -371,11 +377,12 @@ namespace OpenSim.Services.InventoryService
             //
             foreach (UUID id in folderIDs)
             {
-                if (!ParentIsTrash(id))
+                if (onlyIfTrash && !ParentIsTrash(id))
                     continue;
+                //m_log.InfoFormat("[XINVENTORY SERVICE]: Delete folder {0}", id);
                 InventoryFolderBase f = new InventoryFolderBase();
                 f.ID = id;
-                PurgeFolder(f);
+                PurgeFolder(f, onlyIfTrash);
                 m_Database.DeleteFolders("folderID", id.ToString());
             }
 
@@ -384,10 +391,15 @@ namespace OpenSim.Services.InventoryService
 
         public virtual bool PurgeFolder(InventoryFolderBase folder)
         {
+            return PurgeFolder(folder, true);
+        }
+
+        public virtual bool PurgeFolder(InventoryFolderBase folder, bool onlyIfTrash)
+        {
             if (!m_AllowDelete)
                 return false;
 
-            if (!ParentIsTrash(folder.ID))
+            if (onlyIfTrash && !ParentIsTrash(folder.ID))
                 return false;
 
             XInventoryFolder[] subFolders = m_Database.GetFolders(
@@ -396,7 +408,7 @@ namespace OpenSim.Services.InventoryService
 
             foreach (XInventoryFolder x in subFolders)
             {
-                PurgeFolder(ConvertToOpenSim(x));
+                PurgeFolder(ConvertToOpenSim(x), onlyIfTrash);
                 m_Database.DeleteFolders("folderID", x.folderID.ToString());
             }
 
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 079bcb1..a4b3cbd 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -231,7 +231,8 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
+            string DSTZone)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -260,7 +261,45 @@ namespace OpenSim.Services.LLLoginService
             FillOutRegionData(destination);
 
             FillOutSeedCap(aCircuit, destination, clientIP);
-            
+
+            switch (DSTZone)
+            {
+                case "none":
+                    DST = "N";
+                    break;
+                case "local":
+                    DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    break;
+                default:
+                    TimeZoneInfo dstTimeZone = null;
+                    string[] tzList = DSTZone.Split(';');
+
+                    foreach (string tzName in tzList)
+                    {
+                        try
+                        {
+                            dstTimeZone = TimeZoneInfo.FindSystemTimeZoneById(tzName);
+                        }
+                        catch
+                        {
+                            continue;
+                        }
+                        break;
+                    }
+
+                    if (dstTimeZone == null)
+                    {
+                        m_log.WarnFormat(
+                            "[LLOGIN RESPONSE]: No valid timezone found for DST in {0}, falling back to system time.", tzList);
+                        DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                    else
+                    {
+                        DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                
+                    break;
+            }
         }
 
         private void FillOutInventoryData(List<InventoryFolderBase> invSkel, ILibraryService libService)
@@ -355,7 +394,31 @@ namespace OpenSim.Services.LLLoginService
 
         private void SetDefaultValues()
         {
-            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            TimeZoneInfo gridTimeZone;
+
+            // Disabled for now pending making timezone a config value, which can at some point have a default of
+            // a ; separated list of possible timezones.
+            // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across
+            // windows, mac and various distributions of linux, introducing another element of consistency.
+            // The server operator needs to be able to control this setting
+//            try
+//            {
+//                // First try to fetch DST from Pacific Standard Time, because this is
+//                // the one expected by the viewer. "US/Pacific" is the string to search 
+//                // on linux and mac, and should work also on Windows (to confirm)
+//                gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
+//            }
+//            catch (Exception e)
+//            {
+//                m_log.WarnFormat(
+//                    "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time",
+//                    e.Message);
+
+                gridTimeZone = TimeZoneInfo.Local;
+//            }
+
+            DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+
             StipendSinceLogin = "N";
             Gendered = "Y";
             EverLoggedIn = "Y";
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 891c452..06e05a9 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -82,6 +82,8 @@ namespace OpenSim.Services.LLLoginService
         protected string m_AllowedClients;
         protected string m_DeniedClients;
 
+        protected string m_DSTZone;
+
         IConfig m_LoginServerConfig;
 //        IConfig m_ClientsConfig;
 
@@ -118,6 +120,8 @@ namespace OpenSim.Services.LLLoginService
             m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
             m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
 
+            m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
+
             // Clean up some of these vars
             if (m_MapTileURL != String.Empty)
             {
@@ -241,6 +245,7 @@ namespace OpenSim.Services.LLLoginService
 
             m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}",
                 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0);
+            
             try
             {
                 //
@@ -423,8 +428,11 @@ namespace OpenSim.Services.LLLoginService
                 //
                 // Finally, fill out the response and return it
                 //
-                LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency);
+                LLLoginResponse response
+                    = new LLLoginResponse(
+                        account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
+                        where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
+                        m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                 return response;
@@ -438,7 +446,10 @@ namespace OpenSim.Services.LLLoginService
             }
         }
 
-        protected GridRegion FindDestination(UserAccount account, UUID scopeID, GridUserInfo pinfo, UUID sessionID, string startLocation, GridRegion home, out GridRegion gatekeeper, out string where, out Vector3 position, out Vector3 lookAt, out TeleportFlags flags)
+        protected GridRegion FindDestination(
+            UserAccount account, UUID scopeID, GridUserInfo pinfo, UUID sessionID, string startLocation,
+            GridRegion home, out GridRegion gatekeeper,
+            out string where, out Vector3 position, out Vector3 lookAt, out TeleportFlags flags)
         {
             flags = TeleportFlags.ViaLogin;
 
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 318758d..78f9434 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -58,57 +58,74 @@ namespace OpenSim.Tests.Common
     /// </summary>
     public class SceneHelpers
     {
-        public static TestScene SetupScene()
+        /// <summary>
+        /// We need a scene manager so that test clients can retrieve a scene when performing teleport tests.
+        /// </summary>
+        public SceneManager SceneManager { get; private set; }
+
+        private AgentCircuitManager m_acm = new AgentCircuitManager();
+        private ISimulationDataService m_simDataService
+            = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
+        private IEstateDataService m_estateDataService = null;
+
+        private LocalAssetServicesConnector m_assetService;
+        private LocalAuthenticationServicesConnector m_authenticationService;
+        private LocalInventoryServicesConnector m_inventoryService;
+        private LocalGridServicesConnector m_gridService;
+        private LocalUserAccountServicesConnector m_userAccountService;
+        private LocalPresenceServicesConnector m_presenceService;
+
+        private CoreAssetCache m_cache;
+
+        public SceneHelpers() : this(null) {}
+
+        public SceneHelpers(CoreAssetCache cache)
         {
-            return SetupScene(null);
+            SceneManager = new SceneManager();
+
+            m_assetService          = StartAssetService(cache);
+            m_authenticationService = StartAuthenticationService();
+            m_inventoryService      = StartInventoryService();
+            m_gridService           = StartGridService();
+            m_userAccountService    = StartUserAccountService();
+            m_presenceService       = StartPresenceService();
+
+            m_inventoryService.PostInitialise();
+            m_assetService.PostInitialise();
+            m_userAccountService.PostInitialise();
+            m_presenceService.PostInitialise();
+
+            m_cache = cache;
         }
 
         /// <summary>
         /// Set up a test scene
         /// </summary>
         /// <remarks>
-        /// Automatically starts service threads, as would the normal runtime.
+        /// Automatically starts services, as would the normal runtime.
         /// </remarks>
         /// <returns></returns>
-        public static TestScene SetupScene(CoreAssetCache cache)
+        public TestScene SetupScene()
         {
-            return SetupScene("Unit test region", UUID.Random(), 1000, 1000, cache);
+            return SetupScene("Unit test region", UUID.Random(), 1000, 1000);
         }
 
-        public static TestScene SetupScene(string name, UUID id, uint x, uint y)
+        public TestScene SetupScene(string name, UUID id, uint x, uint y)
         {
-            return SetupScene(name, id, x, y, null);
+            return SetupScene(name, id, x, y, new IniConfigSource());
         }
 
         /// <summary>
-        /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
-        /// or a different, to get a brand new scene with new shared region modules.
+        /// Set up a scene.
         /// </summary>
         /// <param name="name">Name of the region</param>
         /// <param name="id">ID of the region</param>
         /// <param name="x">X co-ordinate of the region</param>
         /// <param name="y">Y co-ordinate of the region</param>
-        /// <param name="cache"></param>
-        /// <returns></returns>
-        public static TestScene SetupScene(
-            string name, UUID id, uint x, uint y, CoreAssetCache cache)
-        {
-            return SetupScene(name, id, x, y, cache, new IniConfigSource());
-        }
-
-        /// <summary>
-        /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
-        /// or a different, to get a brand new scene with new shared region modules.
-        /// </summary>
-        /// <param name="name">Name of the region</param>
-        /// <param name="id">ID of the region</param>
-        /// <param name="x">X co-ordinate of the region</param>
-        /// <param name="y">Y co-ordinate of the region</param>
-        /// <param name="cache"></param>
         /// <param name="configSource"></param>
         /// <returns></returns>
-        public static TestScene SetupScene(
-            string name, UUID id, uint x, uint y, CoreAssetCache cache, IConfigSource configSource)
+        public TestScene SetupScene(
+            string name, UUID id, uint x, uint y, IConfigSource configSource)
         {
             Console.WriteLine("Setting up test scene {0}", name);
 
@@ -119,30 +136,47 @@ namespace OpenSim.Tests.Common
             regInfo.RegionName = name;
             regInfo.RegionID = id;
 
-            AgentCircuitManager acm = new AgentCircuitManager();
             SceneCommunicationService scs = new SceneCommunicationService();
 
-            ISimulationDataService simDataService = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
-            IEstateDataService estateDataService = null;
-
             TestScene testScene = new TestScene(
-                regInfo, acm, scs, simDataService, estateDataService, null, false, configSource, null);
+                regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null);
 
             IRegionModule godsModule = new GodsModule();
             godsModule.Initialise(testScene, new IniConfigSource());
             testScene.AddModule(godsModule.Name, godsModule);
 
-            LocalAssetServicesConnector       assetService       = StartAssetService(testScene, cache);
-                                                                   StartAuthenticationService(testScene);
-            LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene);
-                                                                   StartGridService(testScene);
-            LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
-            LocalPresenceServicesConnector    presenceService    = StartPresenceService(testScene);
-
-            inventoryService.PostInitialise();
-            assetService.PostInitialise();
-            userAccountService.PostInitialise();
-            presenceService.PostInitialise();
+            // Add scene to services
+            m_assetService.AddRegion(testScene);
+
+            if (m_cache != null)
+            {
+                m_cache.AddRegion(testScene);
+                m_cache.RegionLoaded(testScene);
+                testScene.AddRegionModule(m_cache.Name, m_cache);
+            }
+
+            m_assetService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_assetService.Name, m_assetService);
+
+            m_authenticationService.AddRegion(testScene);
+            m_authenticationService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_authenticationService.Name, m_authenticationService);
+
+            m_inventoryService.AddRegion(testScene);
+            m_inventoryService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_inventoryService.Name, m_inventoryService);
+
+            m_gridService.AddRegion(testScene);
+            m_gridService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_gridService.Name, m_gridService);
+
+            m_userAccountService.AddRegion(testScene);
+            m_userAccountService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService);
+
+            m_presenceService.AddRegion(testScene);
+            m_presenceService.RegionLoaded(testScene);
+            testScene.AddRegionModule(m_presenceService.Name, m_presenceService);
             
             testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
             testScene.SetModuleInterfaces();
@@ -153,28 +187,28 @@ namespace OpenSim.Tests.Common
             PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
             physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
             testScene.PhysicsScene
-                = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher",   new IniConfigSource(), "test");
+                = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
 
             testScene.RegionInfo.EstateSettings = new EstateSettings();
             testScene.LoginsDisabled = false;
             testScene.RegisterRegionWithGrid();
 
+            SceneManager.Add(testScene);
+
             return testScene;
         }
 
-        private static LocalAssetServicesConnector StartAssetService(Scene testScene, CoreAssetCache cache)
+        private static LocalAssetServicesConnector StartAssetService(CoreAssetCache cache)
         {
-            LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
             IConfigSource config = new IniConfigSource();
-            
             config.AddConfig("Modules");            
             config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");            
             config.AddConfig("AssetService");
             config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");            
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
-            
+
+            LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
             assetService.Initialise(config);
-            assetService.AddRegion(testScene);
 
             if (cache != null)
             {
@@ -184,56 +218,43 @@ namespace OpenSim.Tests.Common
                 cacheConfig.AddConfig("AssetCache");
 
                 cache.Initialise(cacheConfig);
-                cache.AddRegion(testScene);
-                cache.RegionLoaded(testScene);
-                testScene.AddRegionModule(cache.Name, cache);
             }
-
-            assetService.RegionLoaded(testScene);
-            testScene.AddRegionModule(assetService.Name, assetService);
             
             return assetService;
         }
 
-        private static void StartAuthenticationService(Scene testScene)
+        private static LocalAuthenticationServicesConnector StartAuthenticationService()
         {
-            ISharedRegionModule service = new LocalAuthenticationServicesConnector();
             IConfigSource config = new IniConfigSource();
-            
             config.AddConfig("Modules");
             config.AddConfig("AuthenticationService");
             config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector");
             config.Configs["AuthenticationService"].Set(
                 "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
             config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
-            
+
+            LocalAuthenticationServicesConnector service = new LocalAuthenticationServicesConnector();
             service.Initialise(config);
-            service.AddRegion(testScene);
-            service.RegionLoaded(testScene);
-            testScene.AddRegionModule(service.Name, service);
-            //m_authenticationService = service;
+
+            return service;
         }
 
-        private static LocalInventoryServicesConnector StartInventoryService(Scene testScene)
+        private static LocalInventoryServicesConnector StartInventoryService()
         {
-            LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
-            
             IConfigSource config = new IniConfigSource();            
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
             config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
-            
+
+            LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
             inventoryService.Initialise(config);
-            inventoryService.AddRegion(testScene);
-            inventoryService.RegionLoaded(testScene);
-            testScene.AddRegionModule(inventoryService.Name, inventoryService);
             
             return inventoryService;           
         }
 
-        private static LocalGridServicesConnector StartGridService(Scene testScene)
+        private static LocalGridServicesConnector StartGridService()
         {
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
@@ -245,8 +266,6 @@ namespace OpenSim.Tests.Common
 
             LocalGridServicesConnector gridService = new LocalGridServicesConnector();
             gridService.Initialise(config);
-            gridService.AddRegion(testScene);
-            gridService.RegionLoaded(testScene);
             
             return gridService;
         }
@@ -256,7 +275,7 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="testScene"></param>
         /// <returns></returns>
-        private static LocalUserAccountServicesConnector StartUserAccountService(Scene testScene)
+        private static LocalUserAccountServicesConnector StartUserAccountService()
         {
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
@@ -268,10 +287,6 @@ namespace OpenSim.Tests.Common
 
             LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector();
             userAccountService.Initialise(config);
-
-            userAccountService.AddRegion(testScene);
-            userAccountService.RegionLoaded(testScene);
-            testScene.AddRegionModule(userAccountService.Name, userAccountService);
             
             return userAccountService;
         }
@@ -280,7 +295,7 @@ namespace OpenSim.Tests.Common
         /// Start a presence service
         /// </summary>
         /// <param name="testScene"></param>
-        private static LocalPresenceServicesConnector StartPresenceService(Scene testScene)
+        private static LocalPresenceServicesConnector StartPresenceService()
         {
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
@@ -292,10 +307,6 @@ namespace OpenSim.Tests.Common
 
             LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector();
             presenceService.Initialise(config);
-
-            presenceService.AddRegion(testScene);
-            presenceService.RegionLoaded(testScene);
-            testScene.AddRegionModule(presenceService.Name, presenceService);
             
             return presenceService;
         }
@@ -313,19 +324,52 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Setup modules for a scene.
         /// </summary>
-        /// <param name="scene"></param>
+        /// <remarks>
+        /// If called directly, then all the modules must be shared modules.
+        /// </remarks>
+        /// <param name="scenes"></param>
         /// <param name="config"></param>
         /// <param name="modules"></param>
         public static void SetupSceneModules(Scene scene, IConfigSource config, params object[] modules)
         {
+            SetupSceneModules(new Scene[] { scene }, config, modules);
+        }
+
+        /// <summary>
+        /// Setup modules for a scene using their default settings.
+        /// </summary>
+        /// <param name="scenes"></param>
+        /// <param name="modules"></param>
+        public static void SetupSceneModules(Scene[] scenes, params object[] modules)
+        {
+            SetupSceneModules(scenes, new IniConfigSource(), modules);
+        }
+
+        /// <summary>
+        /// Setup modules for scenes.
+        /// </summary>
+        /// <remarks>
+        /// If called directly, then all the modules must be shared modules.
+        /// </remarks>
+        /// <param name="scenes"></param>
+        /// <param name="config"></param>
+        /// <param name="modules"></param>
+        public static void SetupSceneModules(Scene[] scenes, IConfigSource config, params object[] modules)
+        {
             List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
             foreach (object module in modules)
             {
+//                Console.WriteLine("MODULE RAW {0}", module);
                 if (module is IRegionModule)
                 {
                     IRegionModule m = (IRegionModule)module;
-                    m.Initialise(scene, config);
-                    scene.AddModule(m.Name, m);
+
+                    foreach (Scene scene in scenes)
+                    {
+                        m.Initialise(scene, config);
+                        scene.AddModule(m.Name, m);
+                    }
+
                     m.PostInitialise();
                 }
                 else if (module is IRegionModuleBase)
@@ -333,6 +377,7 @@ namespace OpenSim.Tests.Common
                     // for the new system, everything has to be initialised first,
                     // shared modules have to be post-initialised, then all get an AddRegion with the scene
                     IRegionModuleBase m = (IRegionModuleBase)module;
+//                    Console.WriteLine("MODULE {0}", m.Name);
                     m.Initialise(config);
                     newModules.Add(m);
                 }
@@ -345,15 +390,19 @@ namespace OpenSim.Tests.Common
 
             foreach (IRegionModuleBase module in newModules)
             {
-                module.AddRegion(scene);
-                scene.AddRegionModule(module.Name, module);
+                foreach (Scene scene in scenes)
+                {
+                    module.AddRegion(scene);
+                    scene.AddRegionModule(module.Name, module);
+                }
             }
             
             // RegionLoaded is fired after all modules have been appropriately added to all scenes
             foreach (IRegionModuleBase module in newModules)
-                module.RegionLoaded(scene);                
+                foreach (Scene scene in scenes)
+                    module.RegionLoaded(scene);
 
-            scene.SetModuleInterfaces();
+            foreach (Scene scene in scenes) { scene.SetModuleInterfaces(); }
         }
 
         /// <summary>
@@ -388,6 +437,10 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
         /// </summary>
+        /// <remarks>
+        /// This can be used for tests where there is only one region or where there are multiple non-neighbour regions
+        /// and teleport doesn't take place.
+        /// </remarks>
         /// <param name="scene"></param>
         /// <param name="agentId"></param>
         /// <returns></returns>
@@ -397,6 +450,18 @@ namespace OpenSim.Tests.Common
         }
 
         /// <summary>
+        /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
+        /// </summary>
+        /// <param name="scene"></param>
+        /// <param name="agentId"></param>
+        /// <param name="sceneManager"></param>
+        /// <returns></returns>
+        public static ScenePresence AddScenePresence(Scene scene, UUID agentId, SceneManager sceneManager)
+        {
+            return AddScenePresence(scene, GenerateAgentData(agentId), sceneManager);
+        }
+
+        /// <summary>
         /// Add a root agent.
         /// </summary>
         /// <remarks>
@@ -416,6 +481,30 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData)
         {
+            return AddScenePresence(scene, agentData, null);
+        }
+
+        /// <summary>
+        /// Add a root agent.
+        /// </summary>
+        /// <remarks>
+        /// This function
+        ///
+        /// 1)  Tells the scene that an agent is coming.  Normally, the login service (local if standalone, from the
+        /// userserver if grid) would give initial login data back to the client and separately tell the scene that the
+        /// agent was coming.
+        ///
+        /// 2)  Connects the agent with the scene
+        ///
+        /// This function performs actions equivalent with notifying the scene that an agent is
+        /// coming and then actually connecting the agent to the scene.  The one step missed out is the very first
+        /// </remarks>
+        /// <param name="scene"></param>
+        /// <param name="agentData"></param>
+        /// <param name="sceneManager"></param>
+        /// <returns></returns>
+        public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData, SceneManager sceneManager)
+        {
             // We emulate the proper login sequence here by doing things in four stages
 
             // Stage 0: login
@@ -425,7 +514,7 @@ namespace OpenSim.Tests.Common
             lpsc.m_PresenceService.LoginAgent(agentData.AgentID.ToString(), agentData.SessionID, agentData.SecureSessionID);
 
             // Stages 1 & 2
-            ScenePresence sp = IntroduceClientToScene(scene, agentData, TeleportFlags.ViaLogin);
+            ScenePresence sp = IntroduceClientToScene(scene, sceneManager, agentData, TeleportFlags.ViaLogin);
 
             // Stage 3: Complete the entrance into the region.  This converts the child agent into a root agent.
             sp.CompleteMovement(sp.ControllingClient, true);
@@ -433,7 +522,20 @@ namespace OpenSim.Tests.Common
             return sp;
         }
 
-        private static ScenePresence IntroduceClientToScene(Scene scene, AgentCircuitData agentData, TeleportFlags tf)
+        /// <summary>
+        /// Introduce an agent into the scene by adding a new client.
+        /// </summary>
+        /// <returns>The scene presence added</returns>
+        /// <param name='sceneManager'>
+        /// Scene manager.  Can be null if there is only one region in the test or multiple regions that are not
+        /// neighbours and where no teleporting takes place.
+        /// </param>
+        /// <param name='scene'></param>
+        /// <param name='sceneManager></param>
+        /// <param name='agentData'></param>
+        /// <param name='tf'></param>
+        private static ScenePresence IntroduceClientToScene(
+            Scene scene, SceneManager sceneManager, AgentCircuitData agentData, TeleportFlags tf)
         {
             string reason;
 
@@ -442,7 +544,7 @@ namespace OpenSim.Tests.Common
                 Console.WriteLine("NewUserConnection failed: " + reason);
 
             // Stage 2: add the new client as a child agent to the scene
-            TestClient client = new TestClient(agentData, scene);
+            TestClient client = new TestClient(agentData, scene, sceneManager);
             scene.AddNewClient(client, PresenceType.User);
 
             return scene.GetScenePresence(agentData.AgentID);
@@ -454,7 +556,7 @@ namespace OpenSim.Tests.Common
             acd.child = true;
 
             // XXX: ViaLogin may not be correct for child agents
-            return IntroduceClientToScene(scene, acd, TeleportFlags.ViaLogin);
+            return IntroduceClientToScene(scene, null, acd, TeleportFlags.ViaLogin);
         }
 
         /// <summary>
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index b2c824c..8cea476f 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -46,12 +46,10 @@ namespace OpenSim.Tests.Common.Mock
 
         EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing");
 
-        // TODO: This is a really nasty (and temporary) means of telling the test client which scene to invoke setup
-        // methods on when a teleport is requested
-        public Scene TeleportTargetScene;
         private TestClient TeleportSceneClient;
 
         private Scene m_scene;
+        private SceneManager m_sceneManager;
 
         // Properties so that we can get at received data for test purposes
         public List<UUID> ReceivedOfflineNotifications { get; private set; }
@@ -435,15 +433,29 @@ namespace OpenSim.Tests.Common.Mock
         /// <summary>
         /// Constructor
         /// </summary>
+        /// <remarks>
+        /// Can be used for a test where there is only one region or where there are multiple regions that are not
+        /// neighbours and where no teleporting takes place.  In other situations, the constructor that takes in a
+        /// scene manager should be used.
+        /// </remarks>
         /// <param name="agentData"></param>
         /// <param name="scene"></param>
-        public TestClient(AgentCircuitData agentData, Scene scene)
+        public TestClient(AgentCircuitData agentData, Scene scene) : this(agentData, scene, null) {}
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agentData"></param>
+        /// <param name="scene"></param>
+        /// <param name="sceneManager"></param>
+        public TestClient(AgentCircuitData agentData, Scene scene, SceneManager sceneManager)
         {
             m_agentId = agentData.AgentID;
             m_firstName = agentData.firstname;
             m_lastName = agentData.lastname;
             m_circuitCode = agentData.circuitcode;
             m_scene = scene;
+            m_sceneManager = sceneManager;
             SessionId = agentData.SessionID;
             SecureSessionId = agentData.SecureSessionID;
             CapsSeedUrl = agentData.CapsPath;
@@ -593,8 +605,16 @@ namespace OpenSim.Tests.Common.Mock
             AgentCircuitData newAgent = RequestClientInfo();
 
             // Stage 2: add the new client as a child agent to the scene
-            TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene);
-            TeleportTargetScene.AddNewClient(TeleportSceneClient, PresenceType.User);
+            uint x, y;
+            Utils.LongToUInts(neighbourHandle, out x, out y);
+            x /= Constants.RegionSize;
+            y /= Constants.RegionSize;
+
+            Scene neighbourScene;
+            m_sceneManager.TryGetScene(x, y, out neighbourScene);
+
+            TeleportSceneClient = new TestClient(newAgent, neighbourScene, m_sceneManager);
+            neighbourScene.AddNewClient(TeleportSceneClient, PresenceType.User);
         }
 
         public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
@@ -604,6 +624,13 @@ namespace OpenSim.Tests.Common.Mock
 
             CapsSeedUrl = capsURL;
 
+            // We don't do this here so that the source region can complete processing first in a single-threaded
+            // regression test scenario.  The test itself will have to call CompleteTeleportClientSide() after a teleport
+            // CompleteTeleportClientSide();
+        }
+
+        public void CompleteTeleportClientSide()
+        {
             TeleportSceneClient.CompleteMovement();
             //TeleportTargetScene.AgentCrossing(newAgent.AgentID, new Vector3(90, 90, 90), false);
         }
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 0e4dfb9..4b4d52d 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -46,6 +46,14 @@ namespace OpenSim.Tests.Common.Mock
         {
             m_scene = scene;
             m_parcels = new List<ILandObject>();
+            SetupDefaultParcel();
+        }
+
+        private void SetupDefaultParcel()
+        {
+            ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
+            obj.LandData.Name = "Your Parcel";
+            m_parcels.Add(obj);
         }
 
         public List<ILandObject> ParcelsNearPoint(Vector3 position)
@@ -63,11 +71,7 @@ namespace OpenSim.Tests.Common.Mock
             m_parcels.Clear();
 
             if (setupDefaultParcel)
-            {
-                ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
-                obj.LandData.Name = "Your Parcel";
-                m_parcels.Add(obj);
-            }
+                SetupDefaultParcel();
         }
 
         protected ILandObject GetNoLand()
@@ -102,6 +106,5 @@ namespace OpenSim.Tests.Common.Mock
 
         public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
         public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index ced06de..6744fca 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -27,6 +27,8 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Text;
 using NUnit.Framework;
 using OpenMetaverse;
 
@@ -34,6 +36,38 @@ namespace OpenSim.Tests.Common
 {
     public class TestHelpers
     {
+        private static Stream EnableLoggingConfigStream
+            = new MemoryStream(
+                Encoding.UTF8.GetBytes(
+@"<log4net>
+  <!-- A1 is set to be a ConsoleAppender -->
+  <appender name=""A1"" type=""log4net.Appender.ConsoleAppender"">
+
+    <!-- A1 uses PatternLayout -->
+    <layout type=""log4net.Layout.PatternLayout"">
+    <!-- Print the date in ISO 8601 format -->
+      <!-- <conversionPattern value=""%date [%thread] %-5level %logger %ndc - %message%newline"" /> -->
+      <conversionPattern value=""%date %message%newline"" />
+      </layout>
+  </appender>
+
+  <!-- Set root logger level to DEBUG and its only appender to A1 -->
+  <root>
+    <level value=""DEBUG"" />
+    <appender-ref ref=""A1"" />
+  </root>
+</log4net>"));
+
+        private static Stream DisableLoggingConfigStream
+            = new MemoryStream(
+                Encoding.UTF8.GetBytes(
+                    //    "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>")));
+                    //"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>")));
+//                    "<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"));
+//                    "<configuration><log4net><root></root></log4net></configuration>")));
+//                    "<configuration><log4net><root/></log4net></configuration>"));
+                    "<log4net><root/></log4net>"));
+
         public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
         {
             try
@@ -58,6 +92,19 @@ namespace OpenSim.Tests.Common
             Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name);
         }
 
+        public static void EnableLogging()
+        {
+            log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream);
+        }
+
+        /// <summary>
+        /// Disable logging whilst running the tests.
+        /// </summary>
+        public static void DisableLogging()
+        {
+            log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream);
+        }
+
         /// <summary>
         /// Parse tail section into full UUID.
         /// </summary>
diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs
index 0224505..731df68 100644
--- a/OpenSim/Tests/Torture/NPCTortureTests.cs
+++ b/OpenSim/Tests/Torture/NPCTortureTests.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Tests.Torture
             umm = new UserManagementModule();
             am = new AttachmentsModule();
 
-            scene = SceneHelpers.SetupScene();
+            scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, config, afm, umm, am, new BasicInventoryAccessModule(), new NPCModule());
         }
 
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
index d0d2199..195d47b 100644
--- a/OpenSim/Tests/Torture/ObjectTortureTests.cs
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Tests.Torture
             // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage
             // collected when we teardown this test.  If it's done in a member variable, even if that is subsequently
             // nulled out, the garbage collect can be delayed.
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
 
 //            Process process = Process.GetCurrentProcess();
 //            long startProcessMemory = process.PrivateMemorySize64;
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs
index 2ef55b3..24f278f 100644
--- a/OpenSim/Tests/Torture/ScriptTortureTests.cs
+++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Torture
             // to AssemblyResolver.OnAssemblyResolve fails.
             xEngineConfig.Set("AppDomainLoading", "false");
 
-            m_scene = SceneHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, null, configSource);
+            m_scene = new SceneHelpers().SetupScene("My Test", UUID.Random(), 1000, 1000, configSource);
             SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine, wcModule);
 
             m_scene.EventManager.OnChatFromWorld += OnChatFromWorld;
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index da090dd..b6cd287 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -43,6 +43,14 @@ using Timer = System.Timers.Timer;
 
 namespace pCampBot
 {
+    public enum ConnectionState
+    {
+        Disconnected,
+        Connecting,
+        Connected,
+        Disconnecting
+    }
+
     public class Bot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -86,7 +94,7 @@ namespace pCampBot
         /// <summary>
         /// Is this bot connected to the grid?
         /// </summary>
-        public bool IsConnected { get; private set; }
+        public ConnectionState ConnectionState { get; private set; }
 
         public string FirstName { get; private set; }
         public string LastName { get; private set; }
@@ -130,6 +138,8 @@ namespace pCampBot
             BotManager bm, List<IBehaviour> behaviours,
             string firstName, string lastName, string password, string loginUri)
         {
+            ConnectionState = ConnectionState.Disconnected;
+
             behaviours.ForEach(b => b.Initialize(this));
             
             Client = new GridClient();
@@ -157,10 +167,10 @@ namespace pCampBot
                     Behaviours.ForEach(
                         b =>
                         {
+                            Thread.Sleep(Random.Next(3000, 10000));
+                        
                             // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
                             b.Action();
-
-                            Thread.Sleep(Random.Next(1000, 10000));
                         }
                     );
         }
@@ -178,6 +188,8 @@ namespace pCampBot
         /// </summary>
         public void shutdown()
         {
+            ConnectionState = ConnectionState.Disconnecting;
+
             if (m_actionThread != null)
                 m_actionThread.Abort();
 
@@ -209,9 +221,11 @@ namespace pCampBot
             Client.Network.Disconnected += this.Network_OnDisconnected;
             Client.Objects.ObjectUpdate += Objects_NewPrim;
 
+            ConnectionState = ConnectionState.Connecting;
+
             if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
             {
-                IsConnected = true;
+                ConnectionState = ConnectionState.Connected;
 
                 Thread.Sleep(Random.Next(1000, 10000));
                 m_actionThread = new Thread(Action);
@@ -241,6 +255,8 @@ namespace pCampBot
             }
             else
             {
+                ConnectionState = ConnectionState.Disconnected;
+
                 m_log.ErrorFormat(
                     "{0} {1} cannot login: {2}", FirstName, LastName, Client.Network.LoginMessage);
 
@@ -439,6 +455,8 @@ namespace pCampBot
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
         {
+            ConnectionState = ConnectionState.Disconnected;
+
             m_log.DebugFormat(
                 "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
 
@@ -456,7 +474,6 @@ namespace pCampBot
                && OnDisconnected != null)
 //            if (OnDisconnected != null)
             {
-                IsConnected = false;
                 OnDisconnected(this, EventType.DISCONNECTED);
             }
         }
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0f501b7..d615b3f 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -49,6 +49,14 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public const int DefaultLoginDelay = 5000;
+
+        /// <summary>
+        /// Delay between logins of multiple bots.
+        /// </summary>
+        /// <remarks>TODO: This value needs to be configurable by a command line argument.</remarks>
+        public int LoginDelay { get; set; }
+
         /// <summary>
         /// Command console
         /// </summary>
@@ -84,6 +92,8 @@ namespace pCampBot
         /// </summary>
         public BotManager()
         {
+            LoginDelay = DefaultLoginDelay;
+
             Rng = new Random(Environment.TickCount);
             AssetsReceived = new Dictionary<UUID, bool>();
             RegionsKnown = new Dictionary<ulong, GridRegion>();
@@ -151,28 +161,34 @@ namespace pCampBot
             Array.ForEach<string>(
                 cs.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
 
+            MainConsole.Instance.OutputFormat(
+                "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_<n>",
+                botcount,
+                loginUri,
+                firstName,
+                lastNameStem);
+
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
+
             for (int i = 0; i < botcount; i++)
             {
                 string lastName = string.Format("{0}_{1}", lastNameStem, i);
 
+                // We must give each bot its own list of instantiated behaviours since they store state.
                 List<IBehaviour> behaviours = new List<IBehaviour>();
-        
+    
                 // Hard-coded for now
                 if (behaviourSwitches.Contains("p"))
                     behaviours.Add(new PhysicsBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("g"))
                     behaviours.Add(new GrabbingBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("t"))
                     behaviours.Add(new TeleportBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("c"))
                     behaviours.Add(new CrossBehaviour());
-        
-                MainConsole.Instance.OutputFormat(
-                    "[BOT MANAGER]: Bot {0} {1} configured for behaviours {2}",
-                    firstName, lastName, string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));
 
                 StartBot(this, behaviours, firstName, lastName, password, loginUri);
             }
@@ -211,6 +227,10 @@ namespace pCampBot
              BotManager bm, List<IBehaviour> behaviours,
              string firstName, string lastName, string password, string loginUri)
         {
+            MainConsole.Instance.OutputFormat(
+                "[BOT MANAGER]: Starting bot {0} {1}, behaviours are {2}",
+                firstName, lastName, string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));
+
             Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
 
             pb.OnConnected += handlebotEvent;
@@ -222,7 +242,11 @@ namespace pCampBot
             Thread pbThread = new Thread(pb.startup);
             pbThread.Name = pb.Name;
             pbThread.IsBackground = true;
+
             pbThread.Start();
+
+            // Stagger logins
+            Thread.Sleep(LoginDelay);
         }
 
         /// <summary>
@@ -242,7 +266,7 @@ namespace pCampBot
 
                     lock (m_lBot)
                     {
-                        if (m_lBot.TrueForAll(b => !b.IsConnected))
+                        if (m_lBot.TrueForAll(b => b.ConnectionState == ConnectionState.Disconnected))
                             Environment.Exit(0);
 
                         break;
@@ -251,13 +275,21 @@ namespace pCampBot
         }
 
         /// <summary>
-        /// Shutting down all bots
+        /// Shut down all bots
         /// </summary>
+        /// <remarks>
+        /// We launch each shutdown on its own thread so that a slow shutting down bot doesn't hold up all the others.
+        /// </remarks>
         public void doBotShutdown()
         {
             lock (m_lBot)
-                foreach (Bot pb in m_lBot)
-                    pb.shutdown();
+            {
+                foreach (Bot bot in m_lBot)
+                {
+                    Bot thisBot = bot;
+                    Util.FireAndForget(o => thisBot.shutdown());
+                }
+            }
         }
 
         /// <summary>
@@ -271,11 +303,8 @@ namespace pCampBot
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            Util.FireAndForget(o =>
-            {
-                m_log.Warn("[BOTMANAGER]: Shutting down bots");
-                doBotShutdown();
-            });
+            m_log.Info("[BOTMANAGER]: Shutting down bots");
+            doBotShutdown();
         }
 
         private void HandleShowRegions(string module, string[] cmd)
@@ -302,9 +331,11 @@ namespace pCampBot
             {
                 foreach (Bot pb in m_lBot)
                 {
+                    Simulator currentSim = pb.Client.Network.CurrentSim;
+
                     MainConsole.Instance.OutputFormat(
                         outputFormat,
-                        pb.Name, pb.Client.Network.CurrentSim.Name, pb.IsConnected ? "Connected" : "Disconnected");
+                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
                 }
             }
         }
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index ec5ad04..52e7501 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
@@ -67,7 +68,9 @@ namespace pCampBot
                 BotManager bm = new BotManager();
 
                 //startup specified number of bots.  1 is the default
-                bm.dobotStartup(botcount, config);
+                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, config));
+                startBotThread.Name = "Initial start bots thread";
+                startBotThread.Start();
 
                 while (true)
                 {