Add information about each column to "show queues" region console command help.

This is not used by login if the inventory service and login service are housed in the same ROBUST instance (which is the default config)

.gitignore

@@ -41,6 +41,8 @@ bin/Physics*
 bin/Terrain*
 bin/Regions/*
 bin/UserAssets
+bin/assetcache
+bin/maptiles
 bin/estate_settings.xml
 bin/config-include/CenomeCache.ini
 bin/config-include/FlotsamCache.ini

CONTRIBUTORS.txt

@@ -71,7 +71,6 @@ what it is today.
 * CharlieO
 * ChrisDown
 * Chris Yeoh (IBM)
-* controlbreak
 * coyled
 * Daedius
 * Dong Jun Lan (IBM)
@@ -87,10 +86,8 @@ what it is today.
 * Grumly57
 * GuduleLapointe
 * Ewe Loon
-* Fernando Oliveira
 * Fly-Man
 * Flyte Xevious
-* Garmin Kawaguichi
 * Imaze Rhiano
 * Intimidated
 * Jeremy Bongio (IBM)
@@ -109,7 +106,6 @@ what it is today.
 * M.Igarashi
 * maimedleech
 * Mana Janus
-* MarcelEdward
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -139,11 +135,9 @@ what it is today.
 * Ruud Lathorp
 * SachaMagne
 * Salahzar Stenvaag
-* satguru p srivastava
 * sempuki
 * SignpostMarv
 * SpotOn3D
-* Stefan_Boom / stoehr
 * Strawberry Fride
 * Talun
 * TechplexEngineer (Blake Bourque)
@@ -206,4 +200,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

@@ -122,10 +122,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                             Thread.CurrentThread.ManagedThreadId.ToString() +
                             ")");
                 
-                bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+                m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
-                if (changed)
-		  regionsToLoad[i].EstateSettings.Save();
+                regionsToLoad[i].EstateSettings.Save();
                 
                 if (scene != null)
                 {

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs

@@ -163,7 +163,7 @@ namespace OpenSim.Capabilities.Handlers
                     invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
                     invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
 
-            if (inv != null && inv.Folders != null)
+            if (inv.Folders != null)
             {
                 foreach (InventoryFolderBase invFolder in inv.Folders)
                 {
@@ -173,7 +173,7 @@ namespace OpenSim.Capabilities.Handlers
                 descendents += inv.Folders.Count;
             }
 
-            if (inv != null && inv.Items != null)
+            if (inv.Items != null)
             {
                 foreach (InventoryItemBase invItem in inv.Items)
                 {

OpenSim/Data/IXAssetDataPlugin.cs

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// This interface exists to distinguish between the normal IAssetDataPlugin and the one used by XAssetService
-    /// for now.
-    /// </summary>
-    public interface IXAssetDataPlugin : IPlugin
-    {
-        AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
-        bool ExistsAsset(UUID uuid);
-        List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
-        void Initialise(string connect);
-        bool Delete(string id);
-    }
-}

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -104,11 +104,6 @@ namespace OpenSim.Data.MSSQL
             {
                 return SqlDbType.BigInt;
             }
-            if (type == typeof(DateTime))
-            {
-                return SqlDbType.DateTime;
-            }
-
             return SqlDbType.VarChar;
         }
 

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -1181,72 +1181,6 @@ VALUES
             //            }
             #endregion
         }
-
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "select * from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
-                {
-                    if (!result.Read())
-                    {
-                        return String.Empty;
-                    }
-                    else
-                    {
-                        return Convert.ToString(result["llsd_settings"]);
-                    }
-                }
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            {
-                string sql = "DELETE FROM [regionenvironment] WHERE region_id = @region_id";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-
-                sql = "INSERT INTO [regionenvironment] (region_id, llsd_settings) VALUES (@region_id, @llsd_settings)";
-
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@llsd_settings", settings));
-
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "delete from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-        }
-        #endregion
-
         /// <summary>
         /// Loads the settings of a region.
         /// </summary>
@@ -1436,7 +1370,7 @@ VALUES
             newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
             newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
             newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
             newSettings.SunVector = new Vector3(
@@ -1865,7 +1799,7 @@ VALUES
             parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
             parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
             parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
-            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
+            parameters.Add(_Database.CreateParameter("sandbox", settings.Sandbox));
             parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
             parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
             parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1134,17 +1134,3 @@ ALTER TABLE landaccesslist ADD Expires integer NOT NULL  DEFAULT 0;
 
 COMMIT
 
-:VERSION 37       #---------------- Environment Settings
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[regionenvironment](
-	[region_id] [uniqueidentifier] NOT NULL,
-	[llsd_settings] [varchar](max) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- PRIMARY KEY CLUSTERED
-(
-	[region_id] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -163,52 +163,53 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd =
+                    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))
+                            dbcon);
+
+                    string assetName = asset.Name;
+                    if (asset.Name.Length > 64)
                     {
-                        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
+                    {
+                        using (cmd)
                         {
-                            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();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
+                            // 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();
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                            asset.FullID, asset.Name, e.Message);
+                    }
                 }
             }
         }
@@ -220,31 +221,33 @@ 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);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon))
+                    // need to ensure we dispose
+                    try
                     {
-                        try
+                        using (cmd)
                         {
-                            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);
+                            // 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();
                         }
                     }
+                    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>
@@ -307,41 +310,35 @@ 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);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand(
-                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
-                            dbcon))
+                    try
                     {
-                        cmd.Parameters.AddWithValue("?start", start);
-                        cmd.Parameters.AddWithValue("?count", count);
-    
-                        try
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                            while (dbReader.Read())
                             {
-                                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);
-                                }
+                                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());
                     }
                 }
             }
@@ -356,12 +353,11 @@ 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();
 
-                    using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
+                    cmd.Dispose();
                 }
             }
 
@@ -370,4 +366,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
+}

OpenSim/Data/MySQL/MySQLAuthenticationData.cs

@@ -70,52 +70,41 @@ 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());
 
-                using (MySqlCommand cmd
-                    = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon))
+                IDataReader result = cmd.ExecuteReader();
+
+                if (result.Read())
                 {
-                    cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                    ret.PrincipalID = principalID;
 
-                    IDataReader result = cmd.ExecuteReader();
-    
-                    if (result.Read())
+                    if (m_ColumnNames == null)
                     {
-                        ret.PrincipalID = principalID;
-    
-                        CheckColumnNames(result);
-    
-                        foreach (string s in m_ColumnNames)
-                        {
-                            if (s == "UUID")
-                                continue;
-    
-                            ret.Data[s] = result[s].ToString();
-                        }
-    
-                        return ret;
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
                     }
-                    else
+
+                    foreach (string s in m_ColumnNames)
                     {
-                        return null;
+                        if (s == "UUID")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
                     }
+
+                    return ret;
+                }
+                else
+                {
+                    return null;
                 }
             }
         }
 
-        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)
-                columnNames.Add(row["ColumnName"].ToString());
-
-            m_ColumnNames = columnNames;
-        }
-
         public bool Store(AuthenticationData data)
         {
             if (data.Data.ContainsKey("UUID"))
@@ -123,53 +112,57 @@ namespace OpenSim.Data.MySQL
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            using (MySqlCommand cmd = new MySqlCommand())
+            MySqlCommand cmd = new MySqlCommand();
+
+            string update = "update `"+m_Realm+"` set ";
+            bool first = true;
+            foreach (string field in fields)
             {
-                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 (!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)
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
+
+                cmd.CommandText = insert;
+
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    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 false;
                 }
             }
 
+            cmd.Dispose();
+
             return true;
         }
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            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;
-            }
+            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;
         }
@@ -179,18 +172,18 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (MySqlCommand cmd
-                = new MySqlCommand(
-                    "insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))"))
+            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)
             {
-                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 true;
             }
 
+            cmd.Dispose();
             return false;
         }
 
@@ -199,29 +192,30 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            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.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?token", token);
-                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+            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)
-                    return true;
+            if (ExecuteNonQuery(cmd) > 0)
+            {
+                cmd.Dispose();
+                return true;
             }
 
+            cmd.Dispose();
+
             return false;
         }
 
         private void DoExpire()
         {
-            using (MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()"))
-            {
-                ExecuteNonQuery(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()");
+            ExecuteNonQuery(cmd);
+
+            cmd.Dispose();
 
             m_LastExpire = System.Environment.TickCount;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLAvatarData.cs

@@ -52,15 +52,14 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(UUID principalID, string name)
         {
-            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;
-            }
+            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;
         }

OpenSim/Data/MySQL/MySQLFriendsData.cs

@@ -49,38 +49,34 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(string principalID, string friend)
         {
-            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);
+            MySqlCommand cmd = new MySqlCommand();
 
-                ExecuteNonQuery(cmd);
-            }
+            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);
 
             return true;
         }
 
         public FriendsData[] GetFriends(UUID principalID)
         {
-            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());
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            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);
         }
 
         public FriendsData[] GetFriends(string principalID)
         {
-            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() + '%');
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            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);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -91,17 +91,15 @@ namespace OpenSim.Data.MySQL
             if (m_ColumnNames != null)
                 return;
 
-            List<string> columnNames = new List<string>();
+            m_ColumnNames = new List<string>();
 
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
                 if (row["ColumnName"] != null &&
                         (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
-                    columnNames.Add(row["ColumnName"].ToString());
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
             }
-
-            m_ColumnNames = columnNames;
         }
 
         public virtual T[] Get(string field, string key)

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -467,43 +467,43 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand result = new MySqlCommand(sql, dbcon))
+                    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)
                     {
-                        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.ExecuteNonQuery();
                     }
 
-                    using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon))
-                    {
-                        result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+                    result.Dispose();
 
-                        lock (m_dbLock)
-                            result.ExecuteNonQuery();
+                    result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon);
+                    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();
 
-                    using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
+                    MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon);
+                    cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
 
-                        lock (m_dbLock)
-                            cmd.ExecuteNonQuery();
+                    lock (m_dbLock)
+                    {
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -579,27 +579,25 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (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);
+                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
+                try
+                {
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 
@@ -626,23 +624,21 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+
+                try
                 {
-                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-    
-                    try
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 

OpenSim/Data/MySQL/MySQLPresenceData.cs

@@ -63,14 +63,13 @@ namespace OpenSim.Data.MySQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            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);
-            }
+            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)
@@ -82,18 +81,17 @@ namespace OpenSim.Data.MySQL
             if (regionID == UUID.Zero)
                 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;
-            }
+            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;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -162,7 +162,17 @@ namespace OpenSim.Data.MySQL
                         ret.sizeX = Convert.ToInt32(result["sizeX"]);
                         ret.sizeY = Convert.ToInt32(result["sizeY"]);
 
-                        CheckColumnNames(result);
+                        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());
+                            }
+                        }
 
                         foreach (string s in m_ColumnNames)
                         {
@@ -177,11 +187,7 @@ namespace OpenSim.Data.MySQL
                             if (s == "locY")
                                 continue;
 
-                            object value = result[s];
-                            if (value is DBNull)
-                                ret.Data[s] = null;
-                            else
-                                ret.Data[s] = result[s].ToString();
+                            ret.Data[s] = result[s].ToString();
                         }
 
                         retList.Add(ret);
@@ -192,23 +198,6 @@ 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"))
@@ -329,12 +318,11 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            using (MySqlCommand cmd = new MySqlCommand(command))
-            {
-                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-    
-                return RunCommand(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand(command);
+
+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+            return RunCommand(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -129,114 +129,114 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = dbcon.CreateCommand();
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    foreach (SceneObjectPart prim in obj.Parts)
                     {
-                        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, " +
-                                    "LinkNumber, MediaURL) 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, ?LinkNumber, ?MediaURL)";
-    
-                            FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
-    
-                            ExecuteNonQuery(cmd);
-    
-                            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);
-    
-                            ExecuteNonQuery(cmd);
-                        }
+                        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, " +
+                                "LinkNumber, MediaURL) 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, ?LinkNumber, ?MediaURL)";
+
+                        FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
+
+                        ExecuteNonQuery(cmd);
+
+                        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);
+
+                        ExecuteNonQuery(cmd);
                     }
+                    
+                    cmd.Dispose();
                 }
             }
         }
@@ -969,68 +969,6 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        #region RegionEnvironmentSettings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                string command = "select * from `regionenvironment` where region_id = ?region_id";
-
-                using (MySqlCommand cmd = new MySqlCommand(command))
-                {
-                    cmd.Connection = dbcon;
-
-                    cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
-
-                    IDataReader result = ExecuteReader(cmd);
-                    if (!result.Read())
-                    {
-                        return String.Empty;
-                    }
-                    else
-                    {
-                        return Convert.ToString(result["llsd_settings"]);
-                    }
-                }
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                using (MySqlCommand cmd = dbcon.CreateCommand())
-                {
-                    cmd.CommandText = "REPLACE INTO `regionenvironment` (`region_id`, `llsd_settings`) VALUES (?region_id, ?llsd_settings)";
-
-                    cmd.Parameters.AddWithValue("region_id", regionUUID);
-                    cmd.Parameters.AddWithValue("llsd_settings", settings);
-
-                    ExecuteNonQuery(cmd);
-                }
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                using (MySqlCommand cmd = dbcon.CreateCommand())
-                {
-                    cmd.CommandText = "delete from `regionenvironment` where region_id = ?region_id";
-                    cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
-                    ExecuteNonQuery(cmd);
-                }
-            }
-        }
-        #endregion
-
         public void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
@@ -1345,7 +1283,7 @@ namespace OpenSim.Data.MySQL
             newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
             newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
             newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.SunVector = new Vector3 (
                                                  Convert.ToSingle(row["sunvectorx"]),
                                                  Convert.ToSingle(row["sunvectory"]),
@@ -1862,40 +1800,41 @@ namespace OpenSim.Data.MySQL
             {
                 RemoveItems(primID);
 
-                if (items.Count == 0)
-                    return;
-
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    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)
                     {
-                        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.Parameters.Clear();
+
+                        FillItemCommand(cmd, item);
+
+                        ExecuteNonQuery(cmd);
                     }
+
+                    cmd.Dispose();
                 }
             }
         }

OpenSim/Data/MySQL/MySQLUserAccountData.cs

@@ -62,24 +62,23 @@ namespace OpenSim.Data.MySQL
             if (words.Length > 2)
                 return new UserAccountData[0];
 
-            using (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)", 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 or LastName like ?searchLast)", m_Realm);
-                    cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
+            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)", 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 or LastName like ?searchLast)", m_Realm);
+                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+            }
+
+            return DoQuery(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -1,500 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Data.MySQL
-{
-    public class MySQLXAssetData : IXAssetDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected virtual Assembly Assembly
-        {
-            get { return GetType().Assembly; }
-        }
-
-        private bool m_enableCompression = false;
-        private string m_connectionString;
-        private object m_dbLock = new object();
-
-        /// <summary>
-        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
-        /// </summary>
-        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
-
-        #region IPlugin Members
-
-        public string Version { get { return "1.0.0.0"; } }
-
-        /// <summary>
-        /// <para>Initialises Asset interface</para>
-        /// <para>
-        /// <list type="bullet">
-        /// <item>Loads and initialises the MySQL storage plugin.</item>
-        /// <item>Warns and uses the obsolete mysql_connection.ini if connect string is empty.</item>
-        /// <item>Check for migration</item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        public void Initialise(string connect)
-        {
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: THIS PLUGIN IS STRICTLY EXPERIMENTAL.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DO NOT USE FOR ANY DATA THAT YOU DO NOT MIND LOSING.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DATABASE TABLES CAN CHANGE AT ANY TIME, CAUSING EXISTING DATA TO BE LOST.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-
-            m_connectionString = connect;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, Assembly, "XAssetStore");
-                m.Update();
-            }
-        }
-
-        public void Initialise()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Dispose() { }
-
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        public string Name
-        {
-            get { return "MySQL XAsset storage engine"; }
-        }
-
-        #endregion
-
-        #region IAssetDataPlugin Members
-
-        /// <summary>
-        /// Fetch Asset <paramref name="assetID"/> from database
-        /// </summary>
-        /// <param name="assetID">Asset UUID to fetch</param>
-        /// <returns>Return the asset</returns>
-        /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
-        public AssetBase GetAsset(UUID assetID)
-        {
-//            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
-
-            AssetBase asset = null;
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT name, description, asset_type, local, temporary, asset_flags, creator_id, data FROM xassetsmeta JOIN xassetsdata ON xassetsmeta.hash = xassetsdata.hash WHERE id=?id",
-                        dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["asset_type"], dbReader["creator_id"].ToString());
-                                    asset.Data = (byte[])dbReader["data"];
-                                    asset.Description = (string)dbReader["description"];
-
-                                    string local = dbReader["local"].ToString();
-                                    if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
-                                        asset.Local = true;
-                                    else
-                                        asset.Local = false;
-
-                                    asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
-                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-
-                                    if (m_enableCompression)
-                                    {
-                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
-                                        {
-                                            MemoryStream outputStream = new MemoryStream();
-                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
-    //                                        int compressedLength = asset.Data.Length;
-                                            asset.Data = outputStream.ToArray();
-    
-    //                                        m_log.DebugFormat(
-    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
-    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MYSQL XASSET DATA]: MySql failure fetching asset " + assetID + ": " + e.Message);
-                        }
-                    }
-                }
-            }
-
-            return asset;
-        }
-
-        /// <summary>
-        /// Create an asset in database, or update it if existing.
-        /// </summary>
-        /// <param name="asset">Asset UUID to create</param>
-        /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        public void StoreAsset(AssetBase asset)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlTransaction transaction = dbcon.BeginTransaction())
-                    {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > 64)
-                        {
-                            assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[XASSET 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("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                        }
-
-                        if (m_enableCompression)
-                        {
-                            MemoryStream outputStream = new MemoryStream();
-
-                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
-                            {
-    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
-                                // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
-                                compressionStream.Close();
-                                byte[] compressedData = outputStream.ToArray();
-                                asset.Data = compressedData;
-                            }
-                        }
-
-                        byte[] hash = hasher.ComputeHash(asset.Data);
-
-//                        m_log.DebugFormat(
-//                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
-//                            asset.ID, asset.Name, hash, compressedData.Length);
-
-                        try
-                        {
-                            using (MySqlCommand cmd =
-                                new MySqlCommand(
-                                    "replace INTO xassetsmeta(id, hash, name, description, asset_type, local, temporary, create_time, access_time, asset_flags, creator_id)" +
-                                    "VALUES(?id, ?hash, ?name, ?description, ?asset_type, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?creator_id)",
-                                    dbcon))
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?hash", hash);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?asset_type", 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("?creator_id", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
-
-                            transaction.Rollback();
-
-                            return;
-                        }
-
-                        if (!ExistsData(dbcon, transaction, hash))
-                        {
-                            try
-                            {
-                                using (MySqlCommand cmd =
-                                    new MySqlCommand(
-                                        "INSERT INTO xassetsdata(hash, data) VALUES(?hash, ?data)",
-                                        dbcon))
-                                {
-                                    cmd.Parameters.AddWithValue("?hash", hash);
-                                    cmd.Parameters.AddWithValue("?data", asset.Data);
-                                    cmd.ExecuteNonQuery();
-                                }
-                            }
-                            catch (Exception e)
-                            {
-                                m_log.ErrorFormat("[XASSET DB]: MySQL failure creating asset data {0} with name \"{1}\". Error: {2}",
-                                    asset.FullID, asset.Name, e.Message);
-    
-                                transaction.Rollback();
-    
-                                return;
-                            }
-                        }
-    
-                        transaction.Commit();
-                    }
-                }
-            }
-        }
-
-//        private void UpdateAccessTime(AssetBase asset)
-//        {
-//            lock (m_dbLock)
-//            {
-//                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 (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();
-//                            cmd.Dispose();
-//                        }
-//                    }
-//                    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>
-        /// We assume we already have the m_dbLock.
-        /// </summary>
-        /// TODO: need to actually use the transaction.
-        /// <param name="dbcon"></param>
-        /// <param name="transaction"></param>
-        /// <param name="hash"></param>
-        /// <returns></returns>
-        private bool ExistsData(MySqlConnection dbcon, MySqlTransaction transaction, byte[] hash)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool exists = false;
-
-            using (MySqlCommand cmd = new MySqlCommand("SELECT hash FROM xassetsdata WHERE hash=?hash", dbcon))
-            {
-                cmd.Parameters.AddWithValue("?hash", hash);
-
-                try
-                {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if (dbReader.Read())
-                        {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                            exists = true;
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[XASSETS DB]: MySql failure in ExistsData fetching hash {0}.  Exception {1}{2}",
-                        hash, e.Message, e.StackTrace);
-                }
-            }
-
-            return exists;
-        }
-
-        /// <summary>
-        /// Check if the asset exists in the database
-        /// </summary>
-        /// <param name="uuid">The asset UUID</param>
-        /// <returns>true if it exists, false otherwise.</returns>
-        public bool ExistsAsset(UUID uuid)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool assetExists = false;
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    using (MySqlCommand cmd = new MySqlCommand("SELECT id FROM xassetsmeta WHERE id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", uuid.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                                    assetExists = true;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[XASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
-                        }
-                    }
-                }
-            }
-
-            return assetExists;
-        }
-
-        /// <summary>
-        /// Returns a list of AssetMetadata objects. The list is a subset of
-        /// the entire data set offset by <paramref name="start" /> containing
-        /// <paramref name="count" /> elements.
-        /// </summary>
-        /// <param name="start">The number of results to discard from the total data set.</param>
-        /// <param name="count">The number of rows the returned list should contain.</param>
-        /// <returns>A list of AssetMetadata objects.</returns>
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
-        {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,asset_type,temporary,id,asset_flags,creator_id FROM xassetsmeta LIMIT ?start, ?count", dbcon);
-                    cmd.Parameters.AddWithValue("?start", start);
-                    cmd.Parameters.AddWithValue("?count", count);
-
-                    try
-                    {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
-                        {
-                            while (dbReader.Read())
-                            {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = (sbyte)dbReader["asset_type"];
-                                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["creator_id"].ToString();
-
-                                // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
-
-                                retList.Add(metadata);
-                            }
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
-                }
-            }
-
-            return retList;
-        }
-
-        public bool Delete(string id)
-        {
-//            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand("delete from xassetsmeta where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
-
-                    // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
-                    // keep a reference count (?)
-                }
-            }
-
-            return true;
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -883,15 +883,4 @@ ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL
 
 COMMIT;
 
-:VERSION 44         #--------------------- Environment Settings
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL,
-  `llsd_settings` TEXT NOT NULL,
-  PRIMARY KEY (`region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-COMMIT;
 

OpenSim/Data/MySQL/Resources/XAssetStore.migrations

@@ -1,27 +0,0 @@
-# -----------------
-:VERSION 1
-
-BEGIN;
-
-CREATE TABLE `xassetsmeta` (
-  `id` char(36) NOT NULL,
-  `hash` binary(32) NOT NULL,
-  `name` varchar(64) NOT NULL,
-  `description` varchar(64) NOT NULL,
-  `asset_type` tinyint(4) NOT NULL,
-  `local` tinyint(1) NOT NULL,
-  `temporary` tinyint(1) NOT NULL,
-  `create_time` int(11) NOT NULL,
-  `access_time` int(11) NOT NULL,
-  `asset_flags` int(11) NOT NULL,
-  `creator_id` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-CREATE TABLE `xassetsdata` (
-  `hash` binary(32) NOT NULL,
-  `data` longblob NOT NULL,
-  PRIMARY KEY (`hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-COMMIT;

OpenSim/Data/Null/NullSimulationData.cs

@@ -76,27 +76,9 @@ namespace OpenSim.Data.Null
             //This connector doesn't support the windlight module yet
         }
 
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-            return string.Empty;
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-        #endregion
-
         public RegionSettings LoadRegionSettings(UUID regionUUID)
-        {
-            RegionSettings rs = new RegionSettings();
+        {
+            RegionSettings rs = new RegionSettings();
             rs.RegionUUID = regionUUID;
             return rs;
         }

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -564,14 +564,3 @@ COMMIT;
 BEGIN;
 ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
 COMMIT;
-
-:VERSION 26
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
-  `llsd_settings` TEXT NOT NULL
-);
-
-COMMIT;

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -61,7 +61,6 @@ namespace OpenSim.Data.SQLite
         private const string regionbanListSelect = "select * from regionban";
         private const string regionSettingsSelect = "select * from regionsettings";
         private const string regionWindlightSelect = "select * from regionwindlight";
-        private const string regionEnvironmentSelect = "select * from regionenvironment";
         private const string regionSpawnPointsSelect = "select * from spawn_points";
 
         private DataSet ds;
@@ -73,7 +72,6 @@ namespace OpenSim.Data.SQLite
         private SqliteDataAdapter landAccessListDa;
         private SqliteDataAdapter regionSettingsDa;
         private SqliteDataAdapter regionWindlightDa;
-        private SqliteDataAdapter regionEnvironmentDa;
         private SqliteDataAdapter regionSpawnPointsDa;
 
         private SqliteConnection m_conn;
@@ -148,9 +146,6 @@ namespace OpenSim.Data.SQLite
                 SqliteCommand regionWindlightSelectCmd = new SqliteCommand(regionWindlightSelect, m_conn);
                 regionWindlightDa = new SqliteDataAdapter(regionWindlightSelectCmd);
 
-                SqliteCommand regionEnvironmentSelectCmd = new SqliteCommand(regionEnvironmentSelect, m_conn);
-                regionEnvironmentDa = new SqliteDataAdapter(regionEnvironmentSelectCmd);
-
                 SqliteCommand regionSpawnPointsSelectCmd = new SqliteCommand(regionSpawnPointsSelect, m_conn);
                 regionSpawnPointsDa = new SqliteDataAdapter(regionSpawnPointsSelectCmd);
 
@@ -184,9 +179,6 @@ namespace OpenSim.Data.SQLite
                     ds.Tables.Add(createRegionWindlightTable());
                     setupRegionWindlightCommands(regionWindlightDa, m_conn);
 
-                    ds.Tables.Add(createRegionEnvironmentTable());
-                    setupRegionEnvironmentCommands(regionEnvironmentDa, m_conn);
-
                     ds.Tables.Add(createRegionSpawnPointsTable());
                     setupRegionSpawnPointsCommands(regionSpawnPointsDa, m_conn);
 
@@ -266,15 +258,6 @@ namespace OpenSim.Data.SQLite
                         m_log.ErrorFormat("[SQLITE REGION DB]: Caught fill error on regionwindlight table :{0}", e.Message);
                     }
 
-                    try
-                    {
-                        regionEnvironmentDa.Fill(ds.Tables["regionenvironment"]);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat("[SQLITE REGION DB]: Caught fill error on regionenvironment table :{0}", e.Message);
-                    }
-
                     try
                     {
                         regionSpawnPointsDa.Fill(ds.Tables["spawn_points"]);
@@ -295,13 +278,12 @@ namespace OpenSim.Data.SQLite
                     CreateDataSetMapping(landAccessListDa, "landaccesslist");
                     CreateDataSetMapping(regionSettingsDa, "regionsettings");
                     CreateDataSetMapping(regionWindlightDa, "regionwindlight");
-                    CreateDataSetMapping(regionEnvironmentDa, "regionenvironment");
                     CreateDataSetMapping(regionSpawnPointsDa, "spawn_points");
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[SQLITE REGION DB]: {0} - {1}", e.Message, e.StackTrace);
+                m_log.ErrorFormat("[SQLITE REGION DB]: ", e);
                 Environment.Exit(23);
             }
             return;
@@ -359,11 +341,6 @@ namespace OpenSim.Data.SQLite
                 regionWindlightDa.Dispose();
                 regionWindlightDa = null;
             }
-            if (regionEnvironmentDa != null)
-            {
-                regionEnvironmentDa.Dispose();
-                regionEnvironmentDa = null;
-            }
             if (regionSpawnPointsDa != null)
             {
                 regionSpawnPointsDa.Dispose();
@@ -497,63 +474,6 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        #region Region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-                if (row == null)
-                {
-                    return String.Empty;
-                }
-
-                return (String)row["llsd_settings"];
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-
-                if (row == null)
-                {
-                    row = environmentTable.NewRow();
-                    row["region_id"] = regionUUID.ToString();
-                    row["llsd_settings"] = settings;
-                    environmentTable.Rows.Add(row);
-                }
-                else
-                {
-                    row["llsd_settings"] = settings;
-                }
-
-                regionEnvironmentDa.Update(ds, "regionenvironment");
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-
-                if (row != null)
-                {
-                    row.Delete();
-                }
-
-                regionEnvironmentDa.Update(ds, "regionenvironment");
-            }
-        }
-
-        #endregion
-
         public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             lock (ds)
@@ -1510,17 +1430,6 @@ namespace OpenSim.Data.SQLite
             return regionwindlight;
         }
 
-        private static DataTable createRegionEnvironmentTable()
-        {
-            DataTable regionEnvironment = new DataTable("regionenvironment");
-            createCol(regionEnvironment, "region_id", typeof(String));
-            createCol(regionEnvironment, "llsd_settings", typeof(String));
-
-            regionEnvironment.PrimaryKey = new DataColumn[] { regionEnvironment.Columns["region_id"] };
-
-            return regionEnvironment;
-        }
-
         private static DataTable createRegionSpawnPointsTable()
         {
             DataTable spawn_points = new DataTable("spawn_points");
@@ -2248,7 +2157,7 @@ namespace OpenSim.Data.SQLite
             row["terrain_raise_limit"] = settings.TerrainRaiseLimit;
             row["terrain_lower_limit"] = settings.TerrainLowerLimit;
             row["use_estate_sun"] = settings.UseEstateSun;
-            row["sandbox"] = settings.Sandbox; // unlike other database modules, sqlite uses a lower case s for sandbox!
+            row["Sandbox"] = settings.Sandbox; // database uses upper case S for sandbox
             row["sunvectorx"] = settings.SunVector.X;
             row["sunvectory"] = settings.SunVector.Y;
             row["sunvectorz"] = settings.SunVector.Z;
@@ -2782,14 +2691,6 @@ namespace OpenSim.Data.SQLite
             da.UpdateCommand.Connection = conn;
         }
 
-        private void setupRegionEnvironmentCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            da.InsertCommand = createInsertCommand("regionenvironment", ds.Tables["regionenvironment"]);
-            da.InsertCommand.Connection = conn;
-            da.UpdateCommand = createUpdateCommand("regionenvironment", "region_id=:region_id", ds.Tables["regionenvironment"]);
-            da.UpdateCommand.Connection = conn;
-        }
-
         private void setupRegionSpawnPointsCommands(SqliteDataAdapter da, SqliteConnection conn)
         {
             da.InsertCommand = createInsertCommand("spawn_points", ds.Tables["spawn_points"]);

OpenSim/Data/Tests/RegionTests.cs

@@ -244,10 +244,10 @@ namespace OpenSim.Data.Tests
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
             
-            Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
-            Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
-            Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
-            Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
+            Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
+            Assert.That(newsog.HasChildPrim(tmp1), "Assert.That(newsog.HasChildPrim(tmp1))");
+            Assert.That(newsog.HasChildPrim(tmp2), "Assert.That(newsog.HasChildPrim(tmp2))");
+            Assert.That(newsog.HasChildPrim(tmp3), "Assert.That(newsog.HasChildPrim(tmp3))");
         }
         
         [Test]
@@ -632,6 +632,7 @@ namespace OpenSim.Data.Tests
                 .IgnoreProperty(x=>x.RegionUUID)
                 .IgnoreProperty(x=>x.Scene)
                 .IgnoreProperty(x=>x.Parts)
+                .IgnoreProperty(x=>x.PassCollision)
                 .IgnoreProperty(x=>x.RootPart));
         }
 

OpenSim/Framework/Console/LocalConsole.cs

@@ -296,10 +296,6 @@ namespace OpenSim.Framework.Console
                             matches[0].Groups["Category"].Value);
                     System.Console.Write("]:");
                 }
-                else
-                {
-                    outText = outText.Trim();
-                }
             }
 
             if (level == "error")

OpenSim/Framework/EstateSettings.cs

@@ -322,7 +322,7 @@ namespace OpenSim.Framework
                 l_EstateManagers.Remove(avatarID);
         }
 
-        public bool IsEstateManagerOrOwner(UUID avatarID)
+        public bool IsEstateManager(UUID avatarID)
         {
             if (IsEstateOwner(avatarID))
                 return true;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
-            if (IsEstateManagerOrOwner(user))
+            if (IsEstateManager(user))
                 return true;
 
             return l_EstateAccess.Contains(user);

OpenSim/Framework/IClientAPI.cs

@@ -1222,9 +1222,10 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-        
+
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
+        UUID GetDefaultAnimation(string name);
 
         void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
                                   uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);

OpenSim/Framework/IScene.cs

@@ -66,6 +66,19 @@ namespace OpenSim.Framework
 
         IConfigSource Config { get; }
 
+        /// <summary>
+        /// Are logins enabled on this simulator?
+        /// </summary>
+        bool LoginsEnabled { get; set; }
+
+        /// <summary>
+        /// Is this region ready for use?
+        /// </summary>
+        /// <remarks>
+        /// This does not mean that logins are enabled, merely that they can be.
+        /// </remarks>
+        bool Ready { get; set; }
+
         float TimeDilation { get; }
 
         bool AllowScriptCrossings { get; }

OpenSim/Framework/LocklessQueue.cs

@@ -99,8 +99,13 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        item = oldHeadNext.Item;
+                        item = oldHeadNext.Item;                       
                         haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
+                        if (haveAdvancedHead)
+                        {
+                            oldHeadNext.Item = default(T);
+                            oldHead.Next = null;
+                        }
                     }
                 }
             }
@@ -111,6 +116,10 @@ namespace OpenSim.Framework
 
         public void Clear()
         {
+            // ugly
+            T item;
+            while(count > 0)
+                Dequeue(out item);
             Init();
         }
 

OpenSim/Framework/MemoryWatchdog.cs

@@ -0,0 +1,129 @@
+/*
+ * 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.Threading;
+using log4net;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// Experimental watchdog for memory usage.
+    /// </summary>
+    public static class MemoryWatchdog
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Is this watchdog active?
+        /// </summary>
+        public static bool Enabled
+        {
+            get { return m_enabled; }
+            set
+            {
+//                m_log.DebugFormat("[MEMORY WATCHDOG]: Setting MemoryWatchdog.Enabled to {0}", value);
+
+                if (value && !m_enabled)
+                    UpdateLastRecord(GC.GetTotalMemory(false), Util.EnvironmentTickCount());
+
+                m_enabled = value;
+            }
+        }
+        private static bool m_enabled;
+
+        /// <summary>
+        /// Average memory churn in bytes per millisecond.
+        /// </summary>
+        public static double AverageMemoryChurn
+        {
+            get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
+        }
+
+        /// <summary>
+        /// Maximum number of statistical samples.
+        /// </summary>
+        /// <remarks>
+        /// At the moment this corresponds to 1 minute since the sampling rate is every 2.5 seconds as triggered from
+        /// the main Watchdog.
+        /// </remarks>
+        private static int m_maxSamples = 24;
+
+        /// <summary>
+        /// Time when the watchdog was last updated.
+        /// </summary>
+        private static int m_lastUpdateTick;
+
+        /// <summary>
+        /// Memory used at time of last watchdog update.
+        /// </summary>
+        private static long m_lastUpdateMemory;
+
+        /// <summary>
+        /// Memory churn rate per millisecond.
+        /// </summary>
+        private static double m_churnRatePerMillisecond;
+
+        /// <summary>
+        /// Historical samples for calculating moving average.
+        /// </summary>
+        private static Queue<double> m_samples = new Queue<double>(m_maxSamples);
+
+        public static void Update()
+        {
+            int now = Util.EnvironmentTickCount();
+            long memoryNow = GC.GetTotalMemory(false);
+            long memoryDiff = memoryNow - m_lastUpdateMemory;
+
+            if (memoryDiff >= 0)
+            {
+                if (m_samples.Count >= m_maxSamples)
+                    m_samples.Dequeue();
+
+                double elapsed = Util.EnvironmentTickCountSubtract(now, m_lastUpdateTick);
+
+                // This should never happen since it's not useful for updates to occur with no time elapsed, but
+                // protect ourselves from a divide-by-zero just in case.
+                if (elapsed == 0)
+                    return;
+
+                m_samples.Enqueue(memoryDiff / (double)elapsed);
+            }
+
+            UpdateLastRecord(memoryNow, now);
+        }
+
+        private static void UpdateLastRecord(long memoryNow, int timeNow)
+        {
+            m_lastUpdateMemory = memoryNow;
+            m_lastUpdateTick = timeNow;
+        }
+    }
+}

OpenSim/Framework/MinHeap.cs

@@ -63,12 +63,15 @@ namespace OpenSim.Framework
 
             internal void Clear()
             {
-                this.value = default(T);
                 if (this.handle != null)
-                {
                     this.handle.Clear();
-                    this.handle = null;
-                }
+                ClearRef();
+            }
+
+            internal void ClearRef()
+            {
+                this.value = default(T);
+                this.handle = null;
             }
         }
 
@@ -285,6 +288,7 @@ namespace OpenSim.Framework
             if (--this.size > 0 && index != this.size)
             {
                 Set(this.items[this.size], index);
+                this.items[this.size].ClearRef();
                 if (!BubbleUp(index))
                     BubbleDown(index);
             }

OpenSim/Framework/MultipartForm.cs

@@ -119,7 +119,7 @@ namespace OpenSim.Framework
                 // Copy the temporary stream to the network stream
                 formDataStream.Seek(0, SeekOrigin.Begin);
                 using (Stream requestStream = request.GetRequestStream())
-                    formDataStream.CopyStream(requestStream, (int)formDataStream.Length);
+                    formDataStream.CopyTo(requestStream, (int)formDataStream.Length);
             }
 
             #endregion Stream Writing

OpenSim/Framework/OSChatMessage.cs

@@ -51,12 +51,10 @@ 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>
@@ -104,15 +102,6 @@ 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
@@ -142,15 +131,6 @@ namespace OpenSim.Framework
             set { m_fromID = value; }
         }
 
-        /// <summary>
-        /// The single recipient or all if not set.
-        /// </summary>
-        public UUID TargetUUID
-        {
-            get { return m_toID; }
-            set { m_toID = value; }
-        }
-
         /// <summary>
         ///
         /// </summary>

OpenSim/Framework/PrimitiveBaseShape.cs

@@ -241,14 +241,10 @@ namespace OpenSim.Framework
 
             m_textureEntry = prim.Textures.GetBytes();
 
-            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;
+            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            SculptData = prim.Sculpt.GetBytes();
+            SculptTexture = prim.Sculpt.SculptTexture;
+            SculptType = (byte)prim.Sculpt.Type;
         }
 
         [XmlIgnore]

OpenSim/Framework/RegionInfo.cs

@@ -421,18 +421,12 @@ namespace OpenSim.Framework
             set { m_internalEndPoint = value; }
         }
 
-        /// <summary>
-        /// The x co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocX
         {
             get { return m_regionLocX.Value; }
             set { m_regionLocX = value; }
         }
 
-        /// <summary>
-        /// The y co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocY
         {
             get { return m_regionLocY.Value; }

OpenSim/Framework/RegionSettings.cs

@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
-using System.Runtime.Serialization;
 
 namespace OpenSim.Framework
 {
@@ -72,32 +71,6 @@ 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
@@ -483,7 +456,7 @@ namespace OpenSim.Framework
         }
 
         // Connected Telehub object
-        private UUID m_TelehubObject = UUID.Zero;
+        private UUID m_TelehubObject;
         public UUID TelehubObject
         {
             get

OpenSim/Framework/SLUtil.cs

@@ -27,9 +27,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using OpenMetaverse;
 
@@ -38,189 +36,239 @@ 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
 
-        private class TypeMapping
-        {
-            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)
-            {
-            }
-        }
-
-        /// <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()
-        {
-            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)
-            {
-                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;
+            switch ((AssetType)assetType)
+            {
+                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)
         {
-            string contentType;
-            if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
-                contentType = inventory2Content[InventoryType.Unknown];
-            return contentType;
+            switch ((InventoryType)invType)
+            {
+                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";
+            }
         }
 
         public static sbyte ContentTypeToSLAssetType(string contentType)
         {
-            sbyte assetType;
-            if (!content2Asset.TryGetValue(contentType, out assetType))
-                assetType = (sbyte)AssetType.Unknown;
-            return (sbyte)assetType;
+            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;
+            }
         }
 
         public static sbyte ContentTypeToSLInvType(string contentType)
         {
-            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;
+            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;
+            }
         }
 
         #endregion SL / file extension / content-type conversions

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors
             = new Dictionary<string, Action<LandData, XmlTextReader>>();

OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs

@@ -30,8 +30,6 @@ using System.Text;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
-using log4net;
-using System.Reflection;
 
 namespace OpenSim.Framework.Serialization.External
 {
@@ -187,29 +185,7 @@ 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();
             
@@ -265,16 +241,7 @@ 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.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(); 
             
             xtw.WriteEndElement();
             

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class UserInventoryItemSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
             = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();

OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs

@@ -78,10 +78,6 @@ 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;
@@ -120,8 +116,6 @@ 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]
@@ -135,8 +129,6 @@ 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()));
         }
     }
 }

OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs

@@ -107,7 +107,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public bool IsSecured
         {
-            get { return _context.IsSecured; }
+            get { return _context.Secured; }
         }
 
         public bool KeepAlive

OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs

@@ -28,252 +28,143 @@
 namespace OpenSim.Framework.Servers.HttpServer
 {
     /// <summary>
-    /// HTTP status codes (almost) as defined by W3C in http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html and IETF in http://tools.ietf.org/html/rfc6585
+    /// HTTP status codes (almost) as defined by W3C in
+    /// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
     /// </summary>
-    public enum OSHttpStatusCode : int
+    public enum OSHttpStatusCode: int
     {
-        #region 1xx Informational status codes providing a provisional response.
+        // 1xx Informational status codes providing a provisional
+        // response.
+        // 100 Tells client that to keep on going sending its request
+        InfoContinue                          = 100,
+        // 101 Server understands request, proposes to switch to different
+        // application level protocol
+        InfoSwitchingProtocols                = 101,
 
-        /// <summary>
-        /// 100 Tells client that to keep on going sending its request
-        /// </summary>
-        InfoContinue = 100,
 
-        /// <summary>
-        /// 101 Server understands request, proposes to switch to different application level protocol
-        /// </summary>
-        InfoSwitchingProtocols = 101,
+        // 2xx Success codes
+        // 200 Request successful
+        SuccessOk                             = 200,
+        // 201 Request successful, new resource created
+        SuccessOkCreated                      = 201,
+        // 202 Request accepted, processing still on-going
+        SuccessOkAccepted                     = 202,
+        // 203 Request successful, meta information not authoritative
+        SuccessOkNonAuthoritativeInformation  = 203,
+        // 204 Request successful, nothing to return in the body
+        SuccessOkNoContent                    = 204,
+        // 205 Request successful, reset displayed content
+        SuccessOkResetContent                 = 205,
+        // 206 Request successful, partial content returned
+        SuccessOkPartialContent               = 206,
 
-        #endregion
+        // 3xx Redirect code: user agent needs to go somewhere else
+        // 300 Redirect: different presentation forms available, take
+        // a pick
+        RedirectMultipleChoices               = 300,
+        // 301 Redirect: requested resource has moved and now lives
+        // somewhere else
+        RedirectMovedPermanently              = 301,
+        // 302 Redirect: Resource temporarily somewhere else, location
+        // might change
+        RedirectFound                         = 302,
+        // 303 Redirect: See other as result of a POST
+        RedirectSeeOther                      = 303,
+        // 304 Redirect: Resource still the same as before
+        RedirectNotModified                   = 304,
+        // 305 Redirect: Resource must be accessed via proxy provided
+        // in location field
+        RedirectUseProxy                      = 305,
+        // 307 Redirect: Resource temporarily somewhere else, location
+        // might change
+        RedirectMovedTemporarily              = 307,
 
-        #region 2xx Success codes
-
-        /// <summary>
-        /// 200 Request successful
-        /// </summary>
-        SuccessOk = 200,
-
-        /// <summary>
-        /// 201 Request successful, new resource created
-        /// </summary>
-        SuccessOkCreated = 201,
-
-        /// <summary>
-        /// 202 Request accepted, processing still on-going
-        /// </summary>
-        SuccessOkAccepted = 202,
-
-        /// <summary>
-        /// 203 Request successful, meta information not authoritative
-        /// </summary>
-        SuccessOkNonAuthoritativeInformation = 203,
-
-        /// <summary>
-        /// 204 Request successful, nothing to return in the body
-        /// </summary>
-        SuccessOkNoContent = 204,
-
-        /// <summary>
-        /// 205 Request successful, reset displayed content
-        /// </summary>
-        SuccessOkResetContent = 205,
-
-        /// <summary>
-        /// 206 Request successful, partial content returned
-        /// </summary>
-        SuccessOkPartialContent = 206,
-
-        #endregion
-
-        #region 3xx Redirect code: user agent needs to go somewhere else
-
-        /// <summary>
-        /// 300 Redirect: different presentation forms available, take a pick
-        /// </summary>
-        RedirectMultipleChoices = 300,
-        
-        /// <summary>
-        /// 301 Redirect: requested resource has moved and now lives somewhere else
-        /// </summary>
-        RedirectMovedPermanently = 301,
-
-        /// <summary>
-        /// 302 Redirect: Resource temporarily somewhere else, location might change
-        /// </summary>
-        RedirectFound = 302,
-
-        /// <summary>
-        /// 303 Redirect: See other as result of a POST
-        /// </summary>
-        RedirectSeeOther = 303,
-
-        /// <summary>
-        /// 304 Redirect: Resource still the same as before
-        /// </summary>
-        RedirectNotModified = 304,
-
-        /// <summary>
-        /// 305 Redirect: Resource must be accessed via proxy provided in location field
-        /// </summary>
-        RedirectUseProxy = 305,
-
-        /// <summary>
-        /// 307 Redirect: Resource temporarily somewhere else, location might change
-        /// </summary>
-        RedirectMovedTemporarily = 307,
-
-        #endregion
-
-        #region 4xx Client error: the client borked the request
-
-        /// <summary>
-        /// 400 Client error: bad request, server does not grok what the client wants
-        /// </summary>
-        ClientErrorBadRequest = 400,
-
-        /// <summary>
-        /// 401 Client error: the client is not authorized, response provides WWW-Authenticate header field with a challenge
-        /// </summary>
-        ClientErrorUnauthorized = 401,
-
-        /// <summary>
-        /// 402 Client error: Payment required (reserved for future use)
-        /// </summary>
-        ClientErrorPaymentRequired = 402,
-
-        /// <summary>
-        /// 403 Client error: Server understood request, will not deliver, do not try again.
-        ClientErrorForbidden = 403,
-
-        /// <summary>
-        /// 404 Client error: Server cannot find anything matching the client request.
-        /// </summary>
-        ClientErrorNotFound = 404,
-
-        /// <summary>
-        /// 405 Client error: The method specified by the client in the request is not allowed for the resource requested
-        /// </summary>
-        ClientErrorMethodNotAllowed = 405,
-
-        /// <summary>
-        /// 406 Client error: Server cannot generate suitable response for the resource and content characteristics requested by the client
-        /// </summary>
-        ClientErrorNotAcceptable = 406,
-
-        /// <summary>
-        /// 407 Client error: Similar to 401, Server requests that client authenticate itself with the proxy first
-        /// </summary>
-        ClientErrorProxyAuthRequired = 407,
-
-        /// <summary>
-        /// 408 Client error: Server got impatient with client and decided to give up waiting for the client's request to arrive
-        /// </summary>
-        ClientErrorRequestTimeout = 408,
-
-        /// <summary>
-        /// 409 Client error: Server could not fulfill the request for a resource as there is a conflict with the current state of the resource but thinks client can do something about this
-        /// </summary>
-        ClientErrorConflict = 409,
-
-        /// <summary>
-        /// 410 Client error: The resource has moved somewhere else, but server has no clue where.
-        /// </summary>
-        ClientErrorGone = 410,
-
-        /// <summary>
-        /// 411 Client error: The server is picky again and insists on having a content-length header field in the request
-        /// </summary>
-        ClientErrorLengthRequired = 411,
-
-        /// <summary>
-        /// 412 Client error: one or more preconditions supplied in the client's request is false
-        /// </summary>
-        ClientErrorPreconditionFailed = 412,
-
-        /// <summary>
-        /// 413 Client error: For fear of reflux, the server refuses to swallow that much data.
-        /// </summary>
-        ClientErrorRequestEntityToLarge = 413,
-
-        /// <summary>
-        /// 414 Client error: The server considers the Request-URI to be indecently long and refuses to even look at it.
-        /// </summary>
-        ClientErrorRequestURITooLong = 414,
-
-        /// <summary>
-        /// 415 Client error: The server has no clue about the media type requested by the client (contrary to popular belief it is not a warez server)
-        /// </summary>
-        ClientErrorUnsupportedMediaType = 415,
-
-        /// <summary>
-        /// 416 Client error: The requested range cannot be delivered by the server.
-        /// </summary>
+        // 4xx Client error: the client borked the request
+        // 400 Client error: bad request, server does not grok what
+        // the client wants
+        ClientErrorBadRequest                 = 400,
+        // 401 Client error: the client is not authorized, response
+        // provides WWW-Authenticate header field with a challenge
+        ClientErrorUnauthorized               = 401,
+        // 402 Client error: Payment required (reserved for future use)
+        ClientErrorPaymentRequired            = 402,
+        // 403 Client error: Server understood request, will not
+        // deliver, do not try again.
+        ClientErrorForbidden                  = 403,
+        // 404 Client error: Server cannot find anything matching the
+        // client request.
+        ClientErrorNotFound                   = 404,
+        // 405 Client error: The method specified by the client in the
+        // request is not allowed for the resource requested
+        ClientErrorMethodNotAllowed           = 405,
+        // 406 Client error: Server cannot generate suitable response
+        // for the resource and content characteristics requested by
+        // the client
+        ClientErrorNotAcceptable              = 406,
+        // 407 Client error: Similar to 401, Server requests that
+        // client authenticate itself with the proxy first
+        ClientErrorProxyAuthRequired          = 407,
+        // 408 Client error: Server got impatient with client and
+        // decided to give up waiting for the client's request to
+        // arrive
+        ClientErrorRequestTimeout             = 408,
+        // 409 Client error: Server could not fulfill the request for
+        // a resource as there is a conflict with the current state of
+        // the resource but thinks client can do something about this
+        ClientErrorConflict                   = 409,
+        // 410 Client error: The resource has moved somewhere else,
+        // but server has no clue where.
+        ClientErrorGone                       = 410,
+        // 411 Client error: The server is picky again and insists on
+        // having a content-length header field in the request
+        ClientErrorLengthRequired             = 411,
+        // 412 Client error: one or more preconditions supplied in the
+        // client's request is false
+        ClientErrorPreconditionFailed         = 412,
+        // 413 Client error: For fear of reflux, the server refuses to
+        // swallow that much data.
+        ClientErrorRequestEntityToLarge       = 413,
+        // 414 Client error: The server considers the Request-URI to
+        // be indecently long and refuses to even look at it.
+        ClientErrorRequestURITooLong          = 414,
+        // 415 Client error: The server has no clue about the media
+        // type requested by the client (contrary to popular belief it
+        // is not a warez server)
+        ClientErrorUnsupportedMediaType       = 415,
+        // 416 Client error: The requested range cannot be delivered
+        // by the server.
         ClientErrorRequestRangeNotSatisfiable = 416,
+        // 417 Client error: The expectations of the client as
+        // expressed in one or more Expect header fields cannot be met
+        // by the server, the server is awfully sorry about this.
+        ClientErrorExpectationFailed          = 417,
+        // 499 Client error: Wildcard error.
+        ClientErrorJoker                      = 499,
 
-        /// <summary>
-        /// 417 Client error: The expectations of the client as expressed in one or more Expect header fields cannot be met by the server, the server is awfully sorry about this.
-        /// </summary>
-        ClientErrorExpectationFailed = 417,
-
-        /// <summary>
-        /// 428 Client error :The 428 status code indicates that the origin server requires the request to be conditional.
-        /// </summary>
-        ClientErrorPreconditionRequired = 428,
-
-        /// <summary>
-        /// 429 Client error: The 429 status code indicates that the user has sent too many requests in a given amount of time ("rate limiting").
-        /// </summary>
-        ClientErrorTooManyRequests = 429,
-
-        /// <summary>
-        /// 431 Client error: The 431 status code indicates that the server is unwilling to process the request because its header fields are too large.  The request MAY be resubmitted after reducing the size of the request header fields.
-        /// </summary>
-        ClientErrorRequestHeaderFieldsTooLarge = 431,
-
-        /// <summary>
-        /// 499 Client error: Wildcard error.
-        /// </summary>
-        ClientErrorJoker = 499,
-
-        #endregion
-
-        #region 5xx Server errors (rare)
-
-        /// <summary>
-        /// 500 Server error: something really strange and unexpected happened
-        /// </summary>
-        ServerErrorInternalError = 500,
-
-        /// <summary>
-        /// 501 Server error: The server does not do the functionality required to carry out the client request. not at all. certainly not before breakfast. but also not after breakfast.
-        /// </summary>
-        ServerErrorNotImplemented = 501,
-
-        /// <summary>
-        /// 502 Server error: While acting as a proxy or a gateway, the server got ditched by the upstream server and as a consequence regretfully cannot fulfill the client's request
-        /// </summary>
-        ServerErrorBadGateway = 502,
-
-        /// <summary>
-        /// 503 Server error: Due to unforseen circumstances the server cannot currently deliver the service requested. Retry-After header might indicate when to try again.
-        /// </summary>
-        ServerErrorServiceUnavailable = 503,
-
-        /// <summary>
-        /// 504 Server error: The server blames the upstream server for not being able to deliver the service requested and claims that the upstream server is too slow delivering the goods.
-        /// </summary>
-        ServerErrorGatewayTimeout = 504,
-
-        /// <summary>
-        /// 505 Server error: The server does not support the HTTP version conveyed in the client's request.
-        /// </summary>
-        ServerErrorHttpVersionNotSupported = 505,
-
-        /// <summary>
-        /// 511 Server error: The 511 status code indicates that the client needs to authenticate to gain network access.
-        /// </summary>
-        ServerErrorNetworkAuthenticationRequired = 511,
-
-        #endregion
+        // 5xx Server errors (rare)
+        // 500 Server error: something really strange and unexpected
+        // happened
+        ServerErrorInternalError              = 500,
+        // 501 Server error: The server does not do the functionality
+        // required to carry out the client request. not at
+        // all. certainly not before breakfast. but also not after
+        // breakfast.
+        ServerErrorNotImplemented             = 501,
+        // 502 Server error: While acting as a proxy or a gateway, the
+        // server got ditched by the upstream server and as a
+        // consequence regretfully cannot fulfill the client's request
+        ServerErrorBadGateway                 = 502,
+        // 503 Server error: Due to unforseen circumstances the server
+        // cannot currently deliver the service requested. Retry-After
+        // header might indicate when to try again.
+        ServerErrorServiceUnavailable         = 503,
+        // 504 Server error: The server blames the upstream server
+        // for not being able to deliver the service requested and
+        // claims that the upstream server is too slow delivering the
+        // goods.
+        ServerErrorGatewayTimeout             = 504,
+        // 505 Server error: The server does not support the HTTP
+        // version conveyed in the client's request.
+        ServerErrorHttpVersionNotSupported    = 505,
     }
 }

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,8 +29,8 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.4";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const string VERSION_NUMBER = "0.7.3";
+        private const Flavour VERSION_FLAVOUR = Flavour.Extended;
 
         public enum Flavour
         {

OpenSim/Framework/Statistics/BaseStatsCollector.cs

@@ -44,14 +44,18 @@ namespace OpenSim.Framework.Statistics
             StringBuilder sb = new StringBuilder(Environment.NewLine);
             sb.Append("MEMORY STATISTICS");
             sb.Append(Environment.NewLine);
-            sb.Append(
-                string.Format(
-                    "Allocated to OpenSim objects: {0} MB\n",
-                    Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)));
-            sb.Append(
-                string.Format(
-                    "Process memory              : {0} MB\n",
-                    Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0)));
+
+            sb.AppendFormat(
+                "Allocated to OpenSim objects: {0} MB\n",
+                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
+
+            sb.AppendFormat(
+                "OpenSim object memory churn : {0} MB/s\n",
+                Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3));
+
+            sb.AppendFormat(
+                "Process memory              : {0} MB\n",
+                Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0));
 
             return sb.ToString();
         }

OpenSim/Framework/TaskInventoryItem.cs

@@ -26,8 +26,6 @@
  */
 
 using System;
-using System.Reflection;
-using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -37,8 +35,6 @@ 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>
@@ -73,9 +69,6 @@ namespace OpenSim.Framework
 
         private bool _ownerChanged = false;
 
-        // This used ONLY during copy. It can't be relied on at other times!
-        private bool _scriptRunning = true;
-
         public UUID AssetID {
             get {
                 return _assetID;
@@ -338,27 +331,12 @@ namespace OpenSim.Framework
             }
         }
 
-        public bool OwnerChanged
-        {
-            get
-            {
+        public bool OwnerChanged {
+            get {
                 return _ownerChanged;
             }
-            set
-            {
-                _ownerChanged = value;
-//                m_log.DebugFormat(
-//                    "[TASK INVENTORY ITEM]: Owner changed set {0} for {1} {2} owned by {3}",
-//                    _ownerChanged, Name, ItemID, OwnerID);
-            }
-        }
-
-        public bool ScriptRunning {
-            get {
-                return _scriptRunning;
-            }
             set {
-                _scriptRunning = value;
+                _ownerChanged = value;
             }
         }
 

OpenSim/Framework/Tests/MundaneFrameworkTests.cs

@@ -227,10 +227,10 @@ namespace OpenSim.Framework.Tests
             es.AddEstateManager(UUID.Zero);
 
             es.AddEstateManager(bannedUserId);
-            Assert.IsTrue(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserId should be EstateManager but isn't.");
+            Assert.IsTrue(es.IsEstateManager(bannedUserId), "bannedUserId should be EstateManager but isn't.");
 
             es.RemoveEstateManager(bannedUserId);
-            Assert.IsFalse(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserID is estateManager but shouldn't be");
+            Assert.IsFalse(es.IsEstateManager(bannedUserId), "bannedUserID is estateManager but shouldn't be");
 
             Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't");
 

OpenSim/Framework/Tests/UtilTest.cs

@@ -214,13 +214,16 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < contenttypes.Length; i++)
             {
-                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
+                if (SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == 18)
+                {
+                    Assert.That(contenttypes[i] == "image/tga");
+                }
                 else
-                    expected = assettypes[i];
-                Assert.AreEqual(expected, SLUtil.ContentTypeToSLAssetType(contenttypes[i]),
-                            String.Format("Incorrect AssetType mapped from Content-Type {0}", contenttypes[i]));
+                {
+                    Assert.That(SLUtil.ContentTypeToSLAssetType(contenttypes[i]) == assettypes[i],
+                                "Expecting {0} but got {1}", assettypes[i],
+                                SLUtil.ContentTypeToSLAssetType(contenttypes[i]));
+                }
             }
 
             int[] inventorytypes = new int[] {-1,0,1,2,3,6,7,8,9,10,15,17,18,20};
@@ -234,7 +237,7 @@ namespace OpenSim.Framework.Tests
                                                "application/vnd.ll.primitive",
                                                "application/vnd.ll.notecard",
                                                "application/vnd.ll.folder",
-                                               "application/vnd.ll.rootfolder",
+                                               "application/octet-stream",
                                                "application/vnd.ll.lsltext",
                                                "image/x-j2c",
                                                "application/vnd.ll.primitive",
@@ -244,8 +247,7 @@ namespace OpenSim.Framework.Tests
         
             for (int i=0;i<inventorytypes.Length;i++)
             {
-                Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
-                    String.Format("Incorrect Content-Type mapped from InventoryType {0}", inventorytypes[i]));
+                Assert.That(SLUtil.SLInvTypeToContentType(inventorytypes[i]) == invcontenttypes[i], "Expected {0}, Got {1}", invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]));
             }
 
             invcontenttypes = new string[]
@@ -278,8 +280,7 @@ namespace OpenSim.Framework.Tests
 
             for (int i = 0; i < invtypes.Length; i++)
             {
-                Assert.AreEqual(invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]),
-                    String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
+                Assert.That(SLUtil.ContentTypeToSLInvType(invcontenttypes[i]) == invtypes[i], "Expected {0}, Got {1}", invtypes[i], SLUtil.ContentTypeToSLInvType(invcontenttypes[i]));
             }
         }
     }

OpenSim/Framework/Util.cs

@@ -35,7 +35,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -379,20 +379,20 @@ namespace OpenSim.Framework
             }
 
             return sb.ToString();
-        }
-
-        /// <summary>
-        /// Is the platform Windows?
-        /// </summary>
-        /// <returns>true if so, false otherwise</returns>
-        public static bool IsWindows()
-        {
-            PlatformID platformId = Environment.OSVersion.Platform;
-
-            return (platformId == PlatformID.Win32NT
-                || platformId == PlatformID.Win32S
-                || platformId == PlatformID.Win32Windows
-                || platformId == PlatformID.WinCE);
+        }
+
+        /// <summary>
+        /// Is the platform Windows?
+        /// </summary>
+        /// <returns>true if so, false otherwise</returns>
+        public static bool IsWindows()
+        {
+            PlatformID platformId = Environment.OSVersion.Platform;
+
+            return (platformId == PlatformID.Win32NT
+                || platformId == PlatformID.Win32S
+                || platformId == PlatformID.Win32Windows
+                || platformId == PlatformID.WinCE);
         }
 
         public static bool LoadArchSpecificWindowsDll(string libraryName)
@@ -1504,27 +1504,27 @@ namespace OpenSim.Framework
             }
 
             return data;
-        }
-
-        /// <summary>
-        /// Used to trigger an early library load on Windows systems.
-        /// </summary>
-        /// <remarks>
-        /// Required to get 32-bit and 64-bit processes to automatically use the
-        /// appropriate native library.
-        /// </remarks>
-        /// <param name="dllToLoad"></param>
-        /// <returns></returns>
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr LoadLibrary(string dllToLoad);
-
-        /// <summary>
-        /// Determine whether the current process is 64 bit
-        /// </summary>
-        /// <returns>true if so, false if not</returns>
-        public static bool Is64BitProcess()
-        {
-            return IntPtr.Size == 8;
+        }
+
+        /// <summary>
+        /// Used to trigger an early library load on Windows systems.
+        /// </summary>
+        /// <remarks>
+        /// Required to get 32-bit and 64-bit processes to automatically use the
+        /// appropriate native library.
+        /// </remarks>
+        /// <param name="dllToLoad"></param>
+        /// <returns></returns>
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr LoadLibrary(string dllToLoad);
+
+        /// <summary>
+        /// Determine whether the current process is 64 bit
+        /// </summary>
+        /// <returns>true if so, false if not</returns>
+        public static bool Is64BitProcess()
+        {
+            return IntPtr.Size == 8;
         }
 
         #region FireAndForget Threading Pattern
@@ -1940,12 +1940,11 @@ namespace OpenSim.Framework
         #region Universal User Identifiers
        /// <summary>
         /// </summary>
-        /// <param name="value">uuid[;endpoint[;first last[;secret]]]</param>
-        /// <param name="uuid">the uuid part</param>
-        /// <param name="url">the endpoint part (e.g. http://foo.com)</param>
-        /// <param name="firstname">the first name part (e.g. Test)</param>
-        /// <param name="lastname">the last name part (e.g User)</param>
-        /// <param name="secret">the secret part</param>
+        /// <param name="value">uuid[;endpoint[;name]]</param>
+        /// <param name="uuid"></param>
+        /// <param name="url"></param>
+        /// <param name="firstname"></param>
+        /// <param name="lastname"></param>
         public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret)
         {
             uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "User"; secret = string.Empty;
@@ -1974,64 +1973,31 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Produces a universal (HG) system-facing identifier given the information
+        /// 
         /// </summary>
         /// <param name="acircuit"></param>
-        /// <returns>uuid[;homeURI[;first last]]</returns>
+        /// <returns>uuid[;endpoint[;name]]</returns>
         public static string ProduceUserUniversalIdentifier(AgentCircuitData acircuit)
         {
             if (acircuit.ServiceURLs.ContainsKey("HomeURI"))
-                return UniversalIdentifier(acircuit.AgentID, acircuit.firstname, acircuit.lastname, acircuit.ServiceURLs["HomeURI"].ToString());
+            {
+                string agentsURI = acircuit.ServiceURLs["HomeURI"].ToString();
+                if (!agentsURI.EndsWith("/"))
+                    agentsURI += "/";
+
+                // This is ugly, but there's no other way, given that the name is changed
+                // in the agent circuit data for foreigners
+                if (acircuit.lastname.Contains("@"))
+                {
+                    string[] parts = acircuit.firstname.Split(new char[] { '.' });
+                    if (parts.Length == 2)
+                        return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
+                }
+                return acircuit.AgentID.ToString() + ";" + agentsURI + ";" + acircuit.firstname + " " + acircuit.lastname;
+            }
             else
                 return acircuit.AgentID.ToString();
-        }
-
-        /// <summary>
-        /// Produces a universal (HG) system-facing identifier given the information
-        /// </summary>
-        /// <param name="id">UUID of the user</param>
-        /// <param name="firstName">first name (e.g Test)</param>
-        /// <param name="lastName">last name (e.g. User)</param>
-        /// <param name="homeURI">homeURI (e.g. http://foo.com)</param>
-        /// <returns>a string of the form uuid[;homeURI[;first last]]</returns>
-        public static string UniversalIdentifier(UUID id, String firstName, String lastName, String homeURI)
-        {
-            string agentsURI = homeURI;
-            if (!agentsURI.EndsWith("/"))
-                agentsURI += "/";
-
-            // This is ugly, but there's no other way, given that the name is changed
-            // in the agent circuit data for foreigners
-            if (lastName.Contains("@"))
-            {
-                string[] parts = firstName.Split(new char[] { '.' });
-                if (parts.Length == 2)
-                    return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1];
-            }
-            return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName;
-
-        }
-
-        /// <summary>
-        /// Produces a universal (HG) user-facing name given the information
-        /// </summary>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        /// <param name="homeURI"></param>
-        /// <returns>string of the form first.last @foo.com or first last</returns>
-        public static string UniversalName(String firstName, String lastName, String homeURI)
-        {
-            Uri uri = null;
-            try
-            {
-                uri = new Uri(homeURI);
-            }
-            catch (UriFormatException)
-            {
-                return firstName + " " + lastName;
-            }
-            return firstName + "." + lastName + " " + "@" + uri.Authority;
-        }
+        }        
         #endregion
     }
 }

OpenSim/Framework/Watchdog.cs

@@ -325,6 +325,9 @@ namespace OpenSim.Framework
                         callback(callbackInfo);
             }
 
+            if (MemoryWatchdog.Enabled)
+                MemoryWatchdog.Update();
+
             m_watchdogTimer.Start();
         }
     }

OpenSim/Framework/WebUtil.cs

@@ -84,27 +84,47 @@ namespace OpenSim.Framework
         /// </summary>
         private static Dictionary<string,object> m_endpointSerializer = new Dictionary<string,object>();
 
-        private static object EndPointLock(string url)
+        /// <summary>
+        /// Make a GET or GET-like request to a web service that returns LLSD
+        /// or JSON data
+        /// </summary>
+        public static OSDMap ServiceRequest(string url, string httpVerb)
         {
-            System.Uri uri = new System.Uri(url);
-            string endpoint = string.Format("{0}:{1}",uri.Host,uri.Port);
+            string errorMessage;
 
-            lock (m_endpointSerializer)
+            try
             {
-                object eplock = null;
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
+                request.Method = httpVerb;
 
-                if (! m_endpointSerializer.TryGetValue(endpoint,out eplock))
+                using (WebResponse response = request.GetResponse())
                 {
-                    eplock = new object();
-                    m_endpointSerializer.Add(endpoint,eplock);
-                    // m_log.WarnFormat("[WEB UTIL] add a new host to end point serializer {0}",endpoint);
+                    using (Stream responseStream = response.GetResponseStream())
+                    {
+                        try
+                        {
+                            string responseStr = responseStream.GetStreamString();
+                            OSD responseOSD = OSDParser.Deserialize(responseStr);
+                            if (responseOSD.Type == OSDType.Map)
+                                return (OSDMap)responseOSD;
+                            else
+                                errorMessage = "Response format was invalid.";
+                        }
+                        catch
+                        {
+                            errorMessage = "Failed to parse the response.";
+                        }
+                    }
                 }
-
-                return eplock;
             }
-        }
+            catch (Exception ex)
+            {
+                m_log.Warn(httpVerb + " on URL " + url + " failed: " + ex.Message);
+                errorMessage = ex.Message;
+            }
 
-        #region JSONRequest
+            return new OSDMap { { "Message", OSD.FromString("Service request failed. " + errorMessage) } };
+        }
 
         /// <summary>
         /// PUT JSON-encoded data to a web service that returns LLSD or
@@ -136,16 +156,9 @@ namespace OpenSim.Framework
         }
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
-        {
-            lock (EndPointLock(url))
-            {
-                return ServiceOSDRequestWorker(url,data,method,timeout,compressed);
-            }
-        }
-
-        private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed)
         {
             int reqnum = RequestNumber++;
+
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
 
             string errorMessage = "unknown error";
@@ -292,10 +305,6 @@ namespace OpenSim.Framework
             return result;
         }
         
-        #endregion JSONRequest
-
-        #region FormRequest
-
         /// <summary>
         /// POST URL-encoded form data to a web service that returns LLSD or
         /// JSON data
@@ -306,14 +315,6 @@ namespace OpenSim.Framework
         }
         
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
-        {
-            lock (EndPointLock(url))
-            {
-                return ServiceFormRequestWorker(url,data,timeout);
-            }
-        }
-
-        private static OSDMap ServiceFormRequestWorker(string url, NameValueCollection data, int timeout)
         {
             int reqnum = RequestNumber++;
             string method = (data != null && data["RequestMethod"] != null) ? data["RequestMethod"] : "unknown";
@@ -407,8 +408,6 @@ namespace OpenSim.Framework
             result["Message"] = OSD.FromString("Service request failed: " + msg);
             return result;
         }
-
-        #endregion FormRequest
         
         #region Uri
 
@@ -545,13 +544,8 @@ namespace OpenSim.Framework
         /// <remarks>
         /// Copying begins at the streams' current positions. The positions are
         /// NOT reset after copying is complete.
-        /// NOTE!! .NET 4.0 adds the method 'Stream.CopyTo(stream, bufferSize)'.
-        /// This function could be replaced with that method once we move
-        /// totally to .NET 4.0. For versions before, this routine exists.
-        /// This routine used to be named 'CopyTo' but the int parameter has
-        /// a different meaning so this method was renamed to avoid any confusion.
         /// </remarks>
-        public static int CopyStream(this Stream copyFrom, Stream copyTo, int maximumBytesToCopy)
+        public static int CopyTo(this Stream copyFrom, Stream copyTo, int maximumBytesToCopy)
         {
             byte[] buffer = new byte[4096];
             int readBytes;
@@ -1123,4 +1117,4 @@ namespace OpenSim.Framework
             return deserial;
         }
     }
-}
+}

OpenSim/Region/Application/OpenSim.cs

@@ -70,7 +70,6 @@ namespace OpenSim
         private Regex m_consolePromptRegex = new Regex(@"([^\\])\\(\w)", RegexOptions.Compiled);
 
         private string m_timedScript = "disabled";
-        private int m_timeInterval = 1200;
         private Timer m_scriptTimer;
 
         public OpenSim(IConfigSource configSource) : base(configSource)
@@ -100,10 +99,6 @@ namespace OpenSim
                     m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
 
                 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
-                if (m_timedScript != "disabled")
-                {
-                    m_timeInterval = startupConfig.GetInt("timer_Interval", 1200);
-                }
 
                 if (m_logFileAppender != null)
                 {
@@ -200,9 +195,9 @@ namespace OpenSim
             PrintFileToConsole("startuplogo.txt");
 
             // For now, start at the 'root' level by default
-            if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
+            if (SceneManager.Scenes.Count == 1) // If there is only one region, select it
                 ChangeSelectedRegion("region",
-                                     new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName});
+                                     new string[] {"change", "region", SceneManager.Scenes[0].RegionInfo.RegionName});
             else
                 ChangeSelectedRegion("region", new string[] {"change", "region", "root"});
 
@@ -221,7 +216,7 @@ namespace OpenSim
             {
                 m_scriptTimer = new Timer();
                 m_scriptTimer.Enabled = true;
-                m_scriptTimer.Interval = m_timeInterval*1000;
+                m_scriptTimer.Interval = 1200*1000;
                 m_scriptTimer.Elapsed += RunAutoTimerScript;
             }
         }
@@ -409,6 +404,10 @@ namespace OpenSim
             m_console.Commands.AddCommand("General", false, "modules unload",
                                           "modules unload <name>",
                                           "Unload a module", HandleModules);
+
+            m_console.Commands.AddCommand("Objects", false, "kill uuid",
+                                          "kill uuid <UUID>",
+                                          "Kill an object by UUID", KillUUID);
         }
 
         public override void ShutdownSpecific()
@@ -461,7 +460,7 @@ namespace OpenSim
             if (cmdparams.Length > 4)
                 alert = String.Format("\n{0}\n", String.Join(" ", cmdparams, 4, cmdparams.Length - 4));
 
-            IList agents = m_sceneManager.GetCurrentSceneAvatars();
+            IList agents = SceneManager.GetCurrentSceneAvatars();
 
             foreach (ScenePresence presence in agents)
             {
@@ -503,11 +502,7 @@ namespace OpenSim
                     string currentCommand;
                     while ((currentCommand = readFile.ReadLine()) != null)
                     {
-                        currentCommand = currentCommand.Trim();
-                        if (!(currentCommand == ""
-                            || currentCommand.StartsWith(";")
-                            || currentCommand.StartsWith("//")
-                            || currentCommand.StartsWith("#")))
+                        if (currentCommand != String.Empty)
                         {
                             m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'");
                             m_console.RunCommand(currentCommand);
@@ -542,7 +537,7 @@ namespace OpenSim
         private void HandleForceUpdate(string module, string[] args)
         {
             MainConsole.Instance.Output("Updating all clients");
-            m_sceneManager.ForceCurrentSceneClientUpdate();
+            SceneManager.ForceCurrentSceneClientUpdate();
         }
 
         /// <summary>
@@ -554,7 +549,7 @@ namespace OpenSim
         {
             if (args.Length == 6)
             {
-                m_sceneManager.HandleEditCommandOnCurrentScene(args);
+                SceneManager.HandleEditCommandOnCurrentScene(args);
             }
             else
             {
@@ -618,11 +613,10 @@ namespace OpenSim
                 return;
             }
 
-            bool changed = PopulateRegionEstateInfo(regInfo);
+            PopulateRegionEstateInfo(regInfo);
             IScene scene;
             CreateRegion(regInfo, true, out scene);
-            if (changed)
-	      regInfo.EstateSettings.Save();
+            regInfo.EstateSettings.Save();
         }
 
         /// <summary>
@@ -765,7 +759,7 @@ namespace OpenSim
                     case "load":
                         if (cmdparams.Length > 1)
                         {
-                            foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
+                            foreach (Scene s in new ArrayList(SceneManager.Scenes))
                             {
                                 MainConsole.Instance.Output(String.Format("Loading module: {0}", cmdparams[1]));
                                 m_moduleLoader.LoadRegionModules(cmdparams[1], s);
@@ -803,14 +797,14 @@ namespace OpenSim
 
                 case "backup":
                     MainConsole.Instance.Output("Triggering save of pending object updates to persistent store");
-                    m_sceneManager.BackupCurrentScene();
+                    SceneManager.BackupCurrentScene();
                     break;
 
                 case "remove-region":
                     string regRemoveName = CombineParams(cmdparams, 0);
 
                     Scene removeScene;
-                    if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
+                    if (SceneManager.TryGetScene(regRemoveName, out removeScene))
                         RemoveRegion(removeScene, false);
                     else
                         MainConsole.Instance.Output("No region with that name");
@@ -820,14 +814,14 @@ namespace OpenSim
                     string regDeleteName = CombineParams(cmdparams, 0);
 
                     Scene killScene;
-                    if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
+                    if (SceneManager.TryGetScene(regDeleteName, out killScene))
                         RemoveRegion(killScene, true);
                     else
                         MainConsole.Instance.Output("no region with that name");
                     break;
 
                 case "restart":
-                    m_sceneManager.RestartCurrentScene();
+                    SceneManager.RestartCurrentScene();
                     break;
             }
         }
@@ -842,7 +836,7 @@ namespace OpenSim
             {
                 string newRegionName = CombineParams(cmdparams, 2);
 
-                if (!m_sceneManager.TrySetCurrentScene(newRegionName))
+                if (!SceneManager.TrySetCurrentScene(newRegionName))
                     MainConsole.Instance.Output(String.Format("Couldn't select region {0}", newRegionName));
             }
             else
@@ -850,7 +844,7 @@ namespace OpenSim
                 MainConsole.Instance.Output("Usage: change region <region name>");
             }
 
-            string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
+            string regionName = (SceneManager.CurrentScene == null ? "root" : SceneManager.CurrentScene.RegionInfo.RegionName);
             MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName));
 
 //            m_log.DebugFormat("Original prompt is {0}", m_consolePrompt);
@@ -868,7 +862,7 @@ namespace OpenSim
             });
 
             m_console.DefaultPrompt = prompt;
-            m_console.ConsoleScene = m_sceneManager.CurrentScene;
+            m_console.ConsoleScene = SceneManager.CurrentScene;
         }
 
         /// <summary>
@@ -892,7 +886,7 @@ namespace OpenSim
                         int newDebug;
                         if (int.TryParse(args[2], out newDebug))
                         {
-                            m_sceneManager.SetDebugPacketLevelOnCurrentScene(newDebug, name);
+                            SceneManager.SetDebugPacketLevelOnCurrentScene(newDebug, name);
                             // We provide user information elsewhere if any clients had their debug level set.
 //                            MainConsole.Instance.OutputFormat("Debug packet level set to {0}", newDebug);
                         }
@@ -907,7 +901,7 @@ namespace OpenSim
                 case "scene":
                     if (args.Length == 4)
                     {
-                        if (m_sceneManager.CurrentScene == null)
+                        if (SceneManager.CurrentScene == null)
                         {
                             MainConsole.Instance.Output("Please use 'change region <regioname>' first");
                         }
@@ -915,7 +909,7 @@ namespace OpenSim
                         {
                             string key = args[2];
                             string value = args[3];
-                            m_sceneManager.CurrentScene.SetSceneCoreDebug(
+                            SceneManager.CurrentScene.SetSceneCoreDebug(
                                 new Dictionary<string, string>() { { key, value } });
 
                             MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value);
@@ -954,18 +948,17 @@ namespace OpenSim
                     IList agents;
                     if (showParams.Length > 1 && showParams[1] == "full")
                     {
-                        agents = m_sceneManager.GetCurrentScenePresences();
+                        agents = SceneManager.GetCurrentScenePresences();
                     } else
                     {
-                        agents = m_sceneManager.GetCurrentSceneAvatars();
+                        agents = SceneManager.GetCurrentSceneAvatars();
                     }
                 
                     MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
 
                     MainConsole.Instance.Output(
                         String.Format("{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", "Firstname", "Lastname",
-                                      "Agent ID", "Root/Child", "Region", "Position")
-                    );
+                                      "Agent ID", "Root/Child", "Region", "Position"));
 
                     foreach (ScenePresence presence in agents)
                     {
@@ -975,7 +968,8 @@ namespace OpenSim
                         if (regionInfo == null)
                         {
                             regionName = "Unresolvable";
-                        } else
+                        }
+                        else
                         {
                             regionName = regionInfo.RegionName;
                         }
@@ -988,8 +982,7 @@ namespace OpenSim
                                 presence.UUID,
                                 presence.IsChildAgent ? "Child" : "Root",
                                 regionName,
-                                presence.AbsolutePosition.ToString())
-                        );
+                                presence.AbsolutePosition.ToString()));
                     }
 
                     MainConsole.Instance.Output(String.Empty);
@@ -1037,9 +1030,10 @@ namespace OpenSim
                         MainConsole.Instance.Output("Shared Module: " + module.Name);
                     }
 
-                    m_sceneManager.ForEachScene(
+                    SceneManager.ForEachScene(
                         delegate(Scene scene) {
                         m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
+
                         foreach (IRegionModule module in scene.Modules.Values)
                         {
                             if (!module.IsSharedModule)
@@ -1050,7 +1044,7 @@ namespace OpenSim
                     }
                     );
 
-                    m_sceneManager.ForEachScene(
+                    SceneManager.ForEachScene(
                         delegate(Scene scene) {
                         MainConsole.Instance.Output("Loaded new region modules in" + scene.RegionInfo.RegionName + " are:");
                         foreach (IRegionModuleBase module in scene.RegionModules.Values)
@@ -1066,7 +1060,7 @@ namespace OpenSim
                     break;
 
                 case "regions":
-                    m_sceneManager.ForEachScene(
+                    SceneManager.ForEachScene(
                         delegate(Scene scene)
                             {
                                 MainConsole.Instance.Output(String.Format(
@@ -1080,7 +1074,7 @@ namespace OpenSim
                     break;
 
                 case "ratings":
-                    m_sceneManager.ForEachScene(
+                    SceneManager.ForEachScene(
                     delegate(Scene scene)
                     {
                         string rating = "";
@@ -1115,7 +1109,7 @@ namespace OpenSim
             cdt.AddColumn("IP", 16);
             cdt.AddColumn("Viewer Name", 24);
 
-            m_sceneManager.ForEachScene(
+            SceneManager.ForEachScene(
                 s =>
                 {
                     foreach (AgentCircuitData aCircuit in s.AuthenticateHandler.GetAgentCircuits().Values)
@@ -1140,13 +1134,13 @@ namespace OpenSim
             cdt.AddColumn("Endpoint", 23);
             cdt.AddColumn("Active?", 7);
 
-            m_sceneManager.ForEachScene(
+            SceneManager.ForEachScene(
                 s => s.ForEachClient(
                     c => cdt.AddRow(
                         s.Name,
                         c.Name,
-                        c.RemoteEndPoint.ToString(),
                         c.CircuitCode.ToString(),
+                        c.RemoteEndPoint.ToString(),                
                         c.IsActive.ToString())));
 
             MainConsole.Instance.Output(cdt.ToString());
@@ -1161,11 +1155,11 @@ namespace OpenSim
         {
             if (cmdparams.Length > 5)
             {
-                m_sceneManager.SaveNamedPrimsToXml2(cmdparams[3], cmdparams[4]);
+                SceneManager.SaveNamedPrimsToXml2(cmdparams[3], cmdparams[4]);
             }
             else
             {
-                m_sceneManager.SaveNamedPrimsToXml2("Primitive", DEFAULT_PRIM_BACKUP_FILENAME);
+                SceneManager.SaveNamedPrimsToXml2("Primitive", DEFAULT_PRIM_BACKUP_FILENAME);
             }
         }
 
@@ -1180,11 +1174,11 @@ namespace OpenSim
 
             if (cmdparams.Length > 0)
             {
-                m_sceneManager.SaveCurrentSceneToXml(cmdparams[2]);
+                SceneManager.SaveCurrentSceneToXml(cmdparams[2]);
             }
             else
             {
-                m_sceneManager.SaveCurrentSceneToXml(DEFAULT_PRIM_BACKUP_FILENAME);
+                SceneManager.SaveCurrentSceneToXml(DEFAULT_PRIM_BACKUP_FILENAME);
             }
         }
 
@@ -1221,13 +1215,13 @@ namespace OpenSim
                         MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
                     }
                 }
-                m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset);
+                SceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset);
             }
             else
             {
                 try
                 {
-                    m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset);
+                    SceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset);
                 }
                 catch (FileNotFoundException)
                 {
@@ -1244,11 +1238,11 @@ namespace OpenSim
         {
             if (cmdparams.Length > 2)
             {
-                m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
+                SceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
             }
             else
             {
-                m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME);
+                SceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME);
             }
         }
 
@@ -1263,7 +1257,7 @@ namespace OpenSim
             {
                 try
                 {
-                    m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
+                    SceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
                 }
                 catch (FileNotFoundException)
                 {
@@ -1274,7 +1268,7 @@ namespace OpenSim
             {
                 try
                 {
-                    m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME);
+                    SceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME);
                 }
                 catch (FileNotFoundException)
                 {
@@ -1291,7 +1285,7 @@ namespace OpenSim
         {
             try
             {
-                m_sceneManager.LoadArchiveToCurrentScene(cmdparams);
+                SceneManager.LoadArchiveToCurrentScene(cmdparams);
             }
             catch (Exception e)
             {
@@ -1305,7 +1299,7 @@ namespace OpenSim
         /// <param name="cmdparams"></param>
         protected void SaveOar(string module, string[] cmdparams)
         {
-            m_sceneManager.SaveCurrentSceneToArchive(cmdparams);
+            SceneManager.SaveCurrentSceneToArchive(cmdparams);
         }
 
         private static string CombineParams(string[] commandParams, int pos)
@@ -1319,6 +1313,58 @@ namespace OpenSim
             return result;
         }
 
+        /// <summary>
+        /// Kill an object given its UUID.
+        /// </summary>
+        /// <param name="cmdparams"></param>
+        protected void KillUUID(string module, string[] cmdparams)
+        {
+            if (cmdparams.Length > 2)
+            {
+                UUID id = UUID.Zero;
+                SceneObjectGroup grp = null;
+                Scene sc = null;
+
+                if (!UUID.TryParse(cmdparams[2], out id))
+                {
+                    MainConsole.Instance.Output("[KillUUID]: Error bad UUID format!");
+                    return;
+                }
+
+                SceneManager.ForEachScene(
+                    delegate(Scene scene)
+                    {
+                        SceneObjectPart part = scene.GetSceneObjectPart(id);
+                        if (part == null)
+                            return;
+
+                        grp = part.ParentGroup;
+                        sc = scene;
+                    });
+
+                if (grp == null)
+                {
+                    MainConsole.Instance.Output(String.Format("[KillUUID]: Given UUID {0} not found!", id));
+                }
+                else
+                {
+                    MainConsole.Instance.Output(String.Format("[KillUUID]: Found UUID {0} in scene {1}", id, sc.RegionInfo.RegionName));
+                    try
+                    {
+                        sc.DeleteSceneObject(grp, false);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[KillUUID]: Error while removing objects from scene: " + e);
+                    }
+                }
+            }
+            else
+            {
+                MainConsole.Instance.Output("[KillUUID]: Usage: kill uuid <UUID>");
+            }
+        }
+
         #endregion
     }
 }

OpenSim/Region/Application/OpenSimBase.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text;
@@ -68,9 +67,6 @@ namespace OpenSim
         private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache";
         private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient";
 
-        // OpenSim.ini Section name for ESTATES Settings
-        public const string ESTATE_SECTION_NAME = "Estates";
-
         protected string proxyUrl;
         protected int proxyOffset = 0;
         
@@ -285,7 +281,7 @@ namespace OpenSim
 
         private void HandleCommanderCommand(string module, string[] cmd)
         {
-            m_sceneManager.SendCommandToPluginModules(cmd);
+            SceneManager.SendCommandToPluginModules(cmd);
         }
 
         private void HandleCommanderHelp(string module, string[] cmd)
@@ -303,7 +299,10 @@ namespace OpenSim
             // Called from base.StartUp()
 
             m_httpServerPort = m_networkServersInfo.HttpListenerPort;
-            m_sceneManager.OnRestartSim += handleRestartRegion;
+            SceneManager.OnRestartSim += handleRestartRegion;
+
+            // Only start the memory watchdog once all regions are ready
+            SceneManager.OnRegionsReadyStatusChange += sm => MemoryWatchdog.Enabled = sm.AllRegionsReady;
         }
 
         /// <summary>
@@ -412,7 +411,7 @@ namespace OpenSim
             // scripting engines.
             scene.CreateScriptInstances();
 
-            m_sceneManager.Add(scene);
+            SceneManager.Add(scene);
 
             if (m_autoCreateClientStack)
             {
@@ -432,7 +431,6 @@ namespace OpenSim
             mscene = scene;
 
             scene.Start();
-
             scene.StartScripts();
 
             return clientServer;
@@ -450,42 +448,12 @@ namespace OpenSim
         {
             RegionInfo regionInfo = scene.RegionInfo;
 
-            string estateOwnerFirstName = null;
-            string estateOwnerLastName = null;
-            string estateOwnerEMail = null;
-            string estateOwnerPassword = null;
-            string rawEstateOwnerUuid = null;
-
-            if (m_config.Source.Configs[ESTATE_SECTION_NAME] != null)
-            {
-                string defaultEstateOwnerName
-                    = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerName", "").Trim();
-                string[] ownerNames = defaultEstateOwnerName.Split(' ');
-
-                if (ownerNames.Length >= 2)
-                {
-                    estateOwnerFirstName = ownerNames[0];
-                    estateOwnerLastName = ownerNames[1];
-                }
-
-                // Info to be used only on Standalone Mode
-                rawEstateOwnerUuid = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerUUID", null);
-                estateOwnerEMail = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerEMail", null);
-                estateOwnerPassword = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null);
-            }
-
             MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName);
             List<char> excluded = new List<char>(new char[1]{' '});
+            string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
+            string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);
 
-
-            if (estateOwnerFirstName == null || estateOwnerLastName == null)
-            {
-                estateOwnerFirstName = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
-                estateOwnerLastName = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);
-            }
-
-            UserAccount account
-                = scene.UserAccountService.GetUserAccount(regionInfo.ScopeID, estateOwnerFirstName, estateOwnerLastName);
+            UserAccount account = scene.UserAccountService.GetUserAccount(regionInfo.ScopeID, first, last);
 
             if (account == null)
             {
@@ -504,35 +472,23 @@ namespace OpenSim
 
                 if (scene.UserAccountService is UserAccountService)
                 {
-                    if (estateOwnerPassword == null)
-                        estateOwnerPassword = MainConsole.Instance.PasswdPrompt("Password");
+                    string password = MainConsole.Instance.PasswdPrompt("Password");
+                    string email = MainConsole.Instance.CmdPrompt("Email", "");
 
-                    if (estateOwnerEMail == null)
-                        estateOwnerEMail = MainConsole.Instance.CmdPrompt("Email");
-
-                    if (rawEstateOwnerUuid == null)
-                        rawEstateOwnerUuid = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
+                    string rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
         
-                    UUID estateOwnerUuid = UUID.Zero;
-                    if (!UUID.TryParse(rawEstateOwnerUuid, out estateOwnerUuid))
+                    UUID principalId = UUID.Zero;
+                    if (!UUID.TryParse(rawPrincipalId, out principalId))
                     {
-                        m_log.ErrorFormat("[OPENSIM]: ID {0} is not a valid UUID", rawEstateOwnerUuid);
+                        m_log.ErrorFormat("[OPENSIM]: ID {0} is not a valid UUID", rawPrincipalId);
                         return;
                     }
 
-                    // If we've been given a zero uuid then this signals that we should use a random user id
-                    if (estateOwnerUuid == UUID.Zero)
-                        estateOwnerUuid = UUID.Random();
-
                     account
                         = ((UserAccountService)scene.UserAccountService).CreateUser(
-                            regionInfo.ScopeID,
-                            estateOwnerUuid,
-                            estateOwnerFirstName,
-                            estateOwnerLastName,
-                            estateOwnerPassword,
-                            estateOwnerEMail);
+                            regionInfo.ScopeID, principalId, first, last, password, email);
                 }
+//                    }
             }
 
             if (account == null)
@@ -561,14 +517,14 @@ namespace OpenSim
         {
             // only need to check this if we are not at the
             // root level
-            if ((m_sceneManager.CurrentScene != null) &&
-                (m_sceneManager.CurrentScene.RegionInfo.RegionID == scene.RegionInfo.RegionID))
+            if ((SceneManager.CurrentScene != null) &&
+                (SceneManager.CurrentScene.RegionInfo.RegionID == scene.RegionInfo.RegionID))
             {
-                m_sceneManager.TrySetCurrentScene("..");
+                SceneManager.TrySetCurrentScene("..");
             }
 
             scene.DeleteAllSceneObjects();
-            m_sceneManager.CloseScene(scene);
+            SceneManager.CloseScene(scene);
             ShutdownClientServer(scene.RegionInfo);
             
             if (!cleanup)
@@ -610,7 +566,7 @@ namespace OpenSim
         public void RemoveRegion(string name, bool cleanUp)
         {
             Scene target;
-            if (m_sceneManager.TryGetScene(name, out target))
+            if (SceneManager.TryGetScene(name, out target))
                 RemoveRegion(target, cleanUp);
         }
 
@@ -623,13 +579,13 @@ namespace OpenSim
         {
             // only need to check this if we are not at the
             // root level
-            if ((m_sceneManager.CurrentScene != null) &&
-                (m_sceneManager.CurrentScene.RegionInfo.RegionID == scene.RegionInfo.RegionID))
+            if ((SceneManager.CurrentScene != null) &&
+                (SceneManager.CurrentScene.RegionInfo.RegionID == scene.RegionInfo.RegionID))
             {
-                m_sceneManager.TrySetCurrentScene("..");
+                SceneManager.TrySetCurrentScene("..");
             }
 
-            m_sceneManager.CloseScene(scene);
+            SceneManager.CloseScene(scene);
             ShutdownClientServer(scene.RegionInfo);
         }
         
@@ -641,7 +597,7 @@ namespace OpenSim
         public void CloseRegion(string name)
         {
             Scene target;
-            if (m_sceneManager.TryGetScene(name, out target))
+            if (SceneManager.TryGetScene(name, out target))
                 CloseRegion(target);
         }
         
@@ -897,7 +853,7 @@ namespace OpenSim
 
             try
             {
-                m_sceneManager.Close();
+                SceneManager.Close();
             }
             catch (Exception e)
             {
@@ -922,7 +878,7 @@ namespace OpenSim
         /// <param name="usernum">The first out parameter describing the number of all the avatars in the Region server</param>
         public void GetAvatarNumber(out int usernum)
         {
-            usernum = m_sceneManager.GetCurrentSceneAvatars().Count;
+            usernum = SceneManager.GetCurrentSceneAvatars().Count;
         }
 
         /// <summary>
@@ -931,7 +887,7 @@ namespace OpenSim
         /// <param name="regionnum">The first out parameter describing the number of regions</param>
         public void GetRegionNumber(out int regionnum)
         {
-            regionnum = m_sceneManager.Scenes.Count;
+            regionnum = SceneManager.Scenes.Count;
         }
         
         /// <summary>
@@ -941,21 +897,15 @@ namespace OpenSim
         /// This method doesn't allow an estate to be created with the same name as existing estates.
         /// </remarks>
         /// <param name="regInfo"></param>
-        /// <param name="estatesByName">A list of estate names that already exist.</param>
-        /// <param name="estateName">Estate name to create if already known</param>
+        /// <param name="existingName">A list of estate names that already exist.</param>
         /// <returns>true if the estate was created, false otherwise</returns>
-        public bool CreateEstate(RegionInfo regInfo, Dictionary<string, EstateSettings> estatesByName, string estateName)
+        public bool CreateEstate(RegionInfo regInfo, List<string> existingNames)
         {
             // Create a new estate
             regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
+            string newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
 
-            string newName;
-            if (estateName != null && estateName != "")
-                newName = estateName;
-            else
-                newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
-
-            if (estatesByName.ContainsKey(newName))
+            if (existingNames.Contains(newName))
             {
                 MainConsole.Instance.OutputFormat("An estate named {0} already exists.  Please try again.", newName);
                 return false;
@@ -977,113 +927,75 @@ namespace OpenSim
         /// Load the estate information for the provided RegionInfo object.
         /// </summary>
         /// <param name="regInfo"></param>
-        public bool PopulateRegionEstateInfo(RegionInfo regInfo)
+        public void PopulateRegionEstateInfo(RegionInfo regInfo)
         {
             if (EstateDataService != null)
                 regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
 
-            if (regInfo.EstateSettings.EstateID != 0)
-                return false;	// estate info in the database did not change
-
-            m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
-            
-            List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();                
-            Dictionary<string, EstateSettings> estatesByName = new Dictionary<string, EstateSettings>();
-
-            foreach (EstateSettings estate in estates)
-                estatesByName[estate.EstateName] = estate;
-
-            string defaultEstateName = null;
-
-            if (m_config.Source.Configs[ESTATE_SECTION_NAME] != null)
+            if (regInfo.EstateSettings.EstateID == 0) // No record at all
             {
-                defaultEstateName = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateName", null);
-
-                if (defaultEstateName != null)
+                m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
+                
+                List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();                
+                List<string> estateNames = new List<string>();
+                foreach (EstateSettings estate in estates)
+                    estateNames.Add(estate.EstateName);                
+                
+                while (true)
                 {
-                    EstateSettings defaultEstate;
-                    bool defaultEstateJoined = false;
-
-                    if (estatesByName.ContainsKey(defaultEstateName))
-                    {
-                        defaultEstate = estatesByName[defaultEstateName];
-
-                        if (EstateDataService.LinkRegion(regInfo.RegionID, (int)defaultEstate.EstateID))
-                            defaultEstateJoined = true;
-                    }
-                    else
-                    {
-                        if (CreateEstate(regInfo, estatesByName, defaultEstateName))
-                            defaultEstateJoined = true;
-                    }
-
-                    if (defaultEstateJoined)
-                        return true; // need to update the database
-                    else
-                        m_log.ErrorFormat(
-                            "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
-                }
-            }
-
-            // If we have no default estate or creation of the default estate failed then ask the user.
-            while (true)
-            {
-                if (estates.Count == 0)
-                {
-                    m_log.Info("[ESTATE]: No existing estates found.  You must create a new one.");
-
-                    if (CreateEstate(regInfo, estatesByName, null))
-                        break;
-                    else
-                        continue;
-                }
-                else
-                {
-                    string response
-                        = MainConsole.Instance.CmdPrompt(
-                            string.Format(
-                                "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName),
-                                "yes",
-                                new List<string>() { "yes", "no" });
-
-                    if (response == "no")
-                    {
-                        if (CreateEstate(regInfo, estatesByName, null))
-                            break;
+                    if (estates.Count == 0)
+                    {                        
+                        m_log.Info("[ESTATE] No existing estates found.  You must create a new one.");
+                        
+                        if (CreateEstate(regInfo, estateNames))
+                            break;                        
                         else
                             continue;
                     }
                     else
                     {
-                        string[] estateNames = estatesByName.Keys.ToArray();
-                        response
+                        string response 
                             = MainConsole.Instance.CmdPrompt(
                                 string.Format(
-                                    "Name of estate to join.  Existing estate names are ({0})",
-                                    string.Join(", ", estateNames)),
-                                estateNames[0]);
-
-                        List<int> estateIDs = EstateDataService.GetEstates(response);
-                        if (estateIDs.Count < 1)
+                                    "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName), 
+                                    "yes", 
+                                    new List<string>() { "yes", "no" });
+                        
+                        if (response == "no")
                         {
-                            MainConsole.Instance.Output("The name you have entered matches no known estate.  Please try again.");
-                            continue;
+                            if (CreateEstate(regInfo, estateNames))                            
+                                break;
+                            else
+                                continue;
+                        }
+                        else
+                        {                           
+                            response 
+                                = MainConsole.Instance.CmdPrompt(
+                                    string.Format(
+                                        "Name of estate to join.  Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), 
+                                    estateNames[0]);
+    
+                            List<int> estateIDs = EstateDataService.GetEstates(response);
+                            if (estateIDs.Count < 1)
+                            {
+                                MainConsole.Instance.Output("The name you have entered matches no known estate.  Please try again.");
+                                continue;
+                            }
+    
+                            int estateID = estateIDs[0];
+    
+                            regInfo.EstateSettings = EstateDataService.LoadEstateSettings(estateID);
+    
+                            if (EstateDataService.LinkRegion(regInfo.RegionID, estateID))
+                                break;
+    
+                            MainConsole.Instance.Output("Joining the estate failed. Please try again.");
                         }
-
-                        int estateID = estateIDs[0];
-
-                        regInfo.EstateSettings = EstateDataService.LoadEstateSettings(estateID);
-
-                        if (EstateDataService.LinkRegion(regInfo.RegionID, estateID))
-                            break;
-
-                        MainConsole.Instance.Output("Joining the estate failed. Please try again.");
                     }
                 }
-	    }
-
-	    return true;	// need to update the database
-	}
+            }
+        }
     }
     
     public class OpenSimConfigSource

OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs

@@ -111,7 +111,6 @@ namespace OpenSim.Region.ClientStack.Linden
         private IAssetService m_assetService;
         private bool m_dumpAssetsToFile = false;
         private string m_regionName;
-        private int m_levelUpload = 0;
 
         public BunchOfCaps(Scene scene, Caps caps)
         {
@@ -122,10 +121,7 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 IConfig sconfig = config.Configs["Startup"];
                 if (sconfig != null)
-                {
                     m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
-                    m_levelUpload = sconfig.GetInt("LevelUpload", 0);
-                }
             }
 
             m_assetService = m_Scene.AssetService;
@@ -384,37 +380,21 @@ namespace OpenSim.Region.ClientStack.Linden
                 llsdRequest.asset_type == "animation" ||
                 llsdRequest.asset_type == "sound")
             {
-                ScenePresence avatar = null;
                 IClientAPI client = null;
-                m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar);
-
-                // check user level
-                if (avatar != null)
+                IScene scene = null;
+                if (GetClient != null)
                 {
-                    client = avatar.ControllingClient;
+                    client = GetClient(m_HostCapsObj.AgentID);
+                    scene = client.Scene;
 
-                    if (avatar.UserLevel < m_levelUpload)
-                    {
-                        if (client != null)
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
-
-                        LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
-                        errorResponse.uploader = "";
-                        errorResponse.state = "error";
-                        return errorResponse;
-                    }
-                }
-
-                // check funds
-                if (client != null)
-                {
-                    IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>();
+                    IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
 
                     if (mm != null)
                     {
                         if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
                         {
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+                            if (client != null)
+                                client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
 
                             LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
                             errorResponse.uploader = "";
@@ -811,7 +791,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID);
                     if (part != null)
                     {
-//                        TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
+                        TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
                         if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID))
                         {
                             return LLSDHelpers.SerialiseLLSDReply(response);

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -317,6 +317,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected readonly UUID m_agentId;
         private readonly uint m_circuitCode;
         private readonly byte[] m_channelVersion = Utils.EmptyBytes;
+        private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
         private readonly IGroupsModule m_GroupsModule;
 
         private int m_cachedTextureSerial;
@@ -347,8 +348,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private int m_animationSequenceNumber = 1;
         private bool m_SendLogoutPacketWhenClosing = true;
         private AgentUpdateArgs lastarg;
-        private bool m_IsActive = true;
-        private bool m_IsLoggingOut = false;
 
         protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>();
         protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
@@ -412,16 +411,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public uint CircuitCode { get { return m_circuitCode; } }
         public int MoneyBalance { get { return m_moneyBalance; } }
         public int NextAnimationSequenceNumber { get { return m_animationSequenceNumber++; } }
-        public bool IsActive
-        {
-            get { return m_IsActive; }
-            set { m_IsActive = value; }
-        }
-        public bool IsLoggingOut
-        {
-            get { return m_IsLoggingOut; }
-            set { m_IsLoggingOut = value; }
-        }
+
+        /// <summary>
+        /// As well as it's function in IClientAPI, in LLClientView we are locking on this property in order to
+        /// prevent race conditions by different threads calling Close().
+        /// </summary>
+        public bool IsActive { get; set; }
+
+        /// <summary>
+        /// Used to synchronise threads when client is being closed.
+        /// </summary>
+        public Object CloseSyncLock { get; private set; }
+
+        public bool IsLoggingOut { get; set; }
 
         public bool DisableFacelights
         {
@@ -446,11 +448,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
 //            DebugPacketLevel = 1;
 
+            CloseSyncLock = new Object();
+
             RegisterInterface<IClientIM>(this);
             RegisterInterface<IClientInventory>(this);
             RegisterInterface<IClientChat>(this);
 
+            InitDefaultAnimations();
+
             m_scene = scene;
+
             m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
             m_entityProps = new PriorityQueue(m_scene.Entities.Count);
             m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
@@ -478,17 +485,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_prioritizer = new Prioritizer(m_scene);
 
             RegisterLocalPacketHandlers();
+
+            IsActive = true;
         }
 
         #region Client Methods
 
         /// <summary>
-        /// Shut down the client view
+        /// Close down the client view
         /// </summary>
         public void Close()
         {
-            IsActive = false;
+            // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
+            // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
+            lock (CloseSyncLock)
+            {
+                if (!IsActive)
+                    return;
 
+                IsActive = false;
+                CloseWithoutChecks();
+            }
+        }
+
+        /// <summary>
+        /// Closes down the client view without first checking whether it is active.
+        /// </summary>
+        /// <remarks>
+        /// This exists because LLUDPServer has to set IsActive = false in earlier synchronous code before calling
+        /// CloseWithoutIsActiveCheck asynchronously.
+        ///
+        /// Callers must lock ClosingSyncLock before calling.
+        /// </remarks>
+        public void CloseWithoutChecks()
+        {
             m_log.DebugFormat(
                 "[CLIENT]: Close has been called for {0} attached to scene {1}",
                 Name, m_scene.RegionInfo.RegionName);
@@ -1906,8 +1936,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             folderBlock.FolderID = folder.ID;
             folderBlock.ParentID = folder.ParentID;
-            //folderBlock.Type = -1;
-            folderBlock.Type = (sbyte)folder.Type;
+            folderBlock.Type = -1;
             folderBlock.Name = Util.StringToBytes256(folder.Name);
 
             return folderBlock;
@@ -3567,7 +3596,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
-            if (!IsActive) return; // We don't need to update inactive clients.
+            // We don't need to update inactive clients.
+            if (!IsActive)
+                return;
 
             CoarseLocationUpdatePacket loc = (CoarseLocationUpdatePacket)PacketPool.Instance.GetPacket(PacketType.CoarseLocationUpdate);
             loc.Header.Reliable = false;
@@ -5164,7 +5195,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer);
             AddLocalPacketHandler(PacketType.AvatarPropertiesUpdate, HandlerAvatarPropertiesUpdate);
             AddLocalPacketHandler(PacketType.ScriptDialogReply, HandlerScriptDialogReply);
-            AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false);
+            AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage);
             AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
             AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship);
             AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship);
@@ -11265,10 +11296,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             scriptQuestion.Data.Questions = question;
             scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName);
             scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName);
-            
+
             OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
         }
 
+        private void InitDefaultAnimations()
+        {
+            using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
+            {
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                if (doc.DocumentElement != null)
+                    foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                    {
+                        if (nod.Attributes["name"] != null)
+                        {
+                            string name = nod.Attributes["name"].Value.ToLower();
+                            string id = nod.InnerText;
+                            m_defaultAnimations.Add(name, (UUID)id);
+                        }
+                    }
+            }
+        }
+
+        public UUID GetDefaultAnimation(string name)
+        {
+            if (m_defaultAnimations.ContainsKey(name))
+                return m_defaultAnimations[name];
+            return UUID.Zero;
+        }
+
         /// <summary>
         /// Handler called when we receive a logout packet.
         /// </summary>

OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs

@@ -278,7 +278,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public string GetStats()
         {
             return string.Format(
-                "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}",
+                "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7} {12,7}",
+                Util.EnvironmentTickCountSubtract(TickLastPacketReceived),
                 PacketsReceived,                                 
                 PacketsSent,
                 PacketsResent,

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -1123,22 +1123,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// regular client pings.
         /// </remarks>
         /// <param name='client'></param>
-        private void DeactivateClientDueToTimeout(IClientAPI client)
+        private void DeactivateClientDueToTimeout(LLClientView client)
         {
-            // We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
-            // though it's set later on by LLClientView.Close()
-            client.IsActive = false;
-
-            m_log.WarnFormat(
-                "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
-                client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
-
-            StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
-
-            if (!client.SceneAgent.IsChildAgent)
-                 client.Kick("Simulator logged you out due to connection timeout");
-
-            client.Close();
+            lock (client.CloseSyncLock)
+            {
+                m_log.WarnFormat(
+                    "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
+                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
+    
+                StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
+    
+                if (!client.SceneAgent.IsChildAgent)
+                     client.Kick("Simulator logged you out due to connection timeout");
+    
+                client.CloseWithoutChecks();
+            }
         }
 
         private void IncomingPacketHandler()

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -53,9 +53,8 @@ namespace OpenSim.Region.ClientStack
         protected ISimulationDataService m_simulationDataService;
         protected IEstateDataService m_estateDataService;
         protected ClientStackManager m_clientStackManager;
-        protected SceneManager m_sceneManager = new SceneManager();
 
-        public SceneManager SceneManager { get { return m_sceneManager; } }
+        public SceneManager SceneManager { get; protected set; }
         public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
         public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } }
         public IEstateDataService EstateDataService { get { return m_estateDataService; } }
@@ -77,6 +76,7 @@ namespace OpenSim.Region.ClientStack
 
         protected override void StartupSpecific()
         {
+            SceneManager = new SceneManager();
             m_clientStackManager = CreateClientStackManager();
 
             Initialize();

OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs

@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         
         protected Scene m_Scene;
         private bool m_dumpAssetsToFile = false;
-        private int  m_levelUpload = 0;
 
         /// <summary>
         /// Each agent has its own singleton collection of transactions
@@ -56,13 +55,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         
         #region IRegionModule Members
 
-        public void Initialise(IConfigSource source)
+        public void Initialise(IConfigSource config)
         {
-            IConfig sconfig = source.Configs["Startup"];
-            if (sconfig != null)
-            {
-                m_levelUpload = sconfig.GetInt("LevelUpload", 0);
-            }
         }
 
         public void AddRegion(Scene scene)
@@ -246,21 +240,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 (AssetType)type == AssetType.Animation) &&
                 tempFile == false)
             {
-                ScenePresence avatar = null;
                 Scene scene = (Scene)remoteClient.Scene;
-                scene.TryGetScenePresence(remoteClient.AgentId, out avatar);
-
-                // check user level
-                if (avatar != null)
-                {
-                    if (avatar.UserLevel < m_levelUpload)
-                    {
-                        remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
-                        return;
-                    }
-                }
-
-                // check funds
                 IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
 
                 if (mm != null)

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 HashSet<string> m_CurrentlyWriting = new HashSet<string>();
+        private List<string> m_CurrentlyWriting = new List<string>();
 #endif
 
         private bool m_FileCacheEnabled = true;
@@ -261,14 +261,10 @@ namespace Flotsam.RegionModules.AssetCache
 
             try
             {
-                // If the file is already cached just update access time.
+                // If the file is already cached, don't cache it, just touch it so access time is updated
                 if (File.Exists(filename))
                 {
-                    lock (m_CurrentlyWriting)
-                    {
-                        if (!m_CurrentlyWriting.Contains(filename))
-                            File.SetLastAccessTime(filename, DateTime.Now);
-                    }
+                    File.SetLastAccessTime(filename, DateTime.Now);
                 }
                 else
                 {

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -48,6 +48,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private Scene m_scene;
+        private IDialogModule m_dialogModule;
         private IInventoryAccessModule m_invAccessModule;
 
         /// <summary>
@@ -88,6 +89,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         
         public void RegionLoaded(Scene scene)
         {
+            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>();
         }
         
@@ -195,9 +197,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
                 catch (Exception e)
                 {
-                    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);
+                    m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace);
                 }
             }
         }
@@ -567,12 +567,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                     m_scene.InventoryService.UpdateItem(item);
 
-                    // If the name of the object has been changed whilst attached then we want to update the inventory
-                    // item in the viewer.
+                    // this gets called when the agent logs off!
                     if (sp.ControllingClient != null)
                         sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
-
                 grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
 //            else
@@ -598,9 +596,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, sp.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, avatar.Name, attachmentpoint, attachOffset, so.RootPart.AttachedPos);
 
             so.DetachFromBackup();
 
@@ -790,9 +788,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)
             {
@@ -861,9 +859,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;

OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs

@@ -251,10 +251,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (bakedTextureFace == null)
                 {
-                    // 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);
+                    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;
                 }
 
@@ -430,8 +430,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                    acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
 
                 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
-                Primitive.TextureEntryFace texture = faceTextures[ftIndex];    // this will be null if there's no such baked texture
-                bakedTextures[bakeType] = texture;
+                bakedTextures[bakeType] = faceTextures[ftIndex];
             }
 
             return bakedTextures;

OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

@@ -186,7 +186,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         {
             string fromName = c.From;
             UUID fromID = UUID.Zero;
-            UUID targetID = c.TargetUUID;
             string message = c.Message;
             IScene scene = c.Scene;
             Vector3 fromPos = c.Position;
@@ -222,38 +221,24 @@ 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}, targetID {5}",
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-
+            
             foreach (Scene s in m_scenes)
             {
-                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)
+                // 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, ChatTypeEnum.Say, message, sourceType, true))
-                                receiverIDs.Add(presence.UUID);
+                        if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType))
+                            receiverIDs.Add(presence.UUID);
                     }
-                }
+                );
             }
-
+            
             (scene as Scene).EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
@@ -330,7 +315,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, bool ignoreDistance)
+                                                  string message, ChatSourceType src)
         {
             // don't send stuff to child agents
             if (presence.IsChildAgent) return false;
@@ -341,15 +326,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
 
             int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
-
-            if (!ignoreDistance)
+            
+            if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
+                type == ChatTypeEnum.Say && dis > m_saydistance ||
+                type == ChatTypeEnum.Shout && dis > m_shoutdistance)
             {
-                if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
-                    type == ChatTypeEnum.Say && dis > m_saydistance ||
-                    type == ChatTypeEnum.Shout && dis > m_shoutdistance)
-                {
-                    return false;
-                }
+                return false;
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView

OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs

@@ -96,13 +96,6 @@ 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
@@ -152,7 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             catch (InvalidOperationException)
             { }
 
-            deadAvatar.setHealthWithUpdate(100.0f);
+            deadAvatar.Health = 100;
             deadAvatar.Scene.TeleportClientHome(deadAvatar.UUID, deadAvatar.ControllingClient);
         }
 
@@ -161,18 +154,14 @@ 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
-                    || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
+                
+                if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
                 {
                     avatar.Invulnerable = false;
                 }
                 else
                 {
                     avatar.Invulnerable = true;
-                    if (avatar.Health < 100.0f)
-                    {
-                        avatar.setHealthWithUpdate(100.0f);
-                    }
                 }
             }
             catch (Exception)

OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }            
         }
 
-        protected virtual void InitModule(IConfigSource config)
+        protected void InitModule(IConfigSource config)
         {
             IConfig friendsConfig = config.Configs["Friends"];
             if (friendsConfig != null)
@@ -535,7 +535,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
-        protected virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im)
+        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if ((InstantMessageDialog)im.dialog == InstantMessageDialog.FriendshipOffered)
             { 
@@ -566,7 +566,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
-        protected virtual bool ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
+        private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
         {
             // !!!!!!!! This is a hack so that we don't have to keep state (transactionID/imSessionID)
             // We stick this agent's ID as imSession, so that it's directly available on the receiving end
@@ -575,7 +575,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             // Try the local sim            
             if (LocalFriendshipOffered(friendID, im))
-                return true;
+                return;
 
             // The prospective friend is not here [as root]. Let's forward.
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
@@ -586,11 +586,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     m_FriendsSimConnector.FriendshipOffered(region, agentID, friendID, im.message);
-                    return true;
                 }
             }
             // If the prospective friend is not online, he'll get the message upon login.
-            return false;
         }
 
         protected virtual string GetFriendshipRequesterName(UUID agentID)
@@ -617,7 +615,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
 
             // Update the local cache. 
-            RecacheFriends(client);
+            CacheFriends(client);
 
             //
             // Notify the friend
@@ -775,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         #region Local
 
-        public virtual bool LocalFriendshipOffered(UUID toID, GridInstantMessage im)
+        public bool LocalFriendshipOffered(UUID toID, GridInstantMessage im)
         {
             IClientAPI friendClient = LocateClientObject(toID);
             if (friendClient != null)
@@ -933,7 +931,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             return FriendsService.GetFriends(client.AgentId);
         }
 
-        protected void RecacheFriends(IClientAPI client)
+        private void RecacheFriends(IClientAPI client)
         {
             // FIXME: Ideally, we want to avoid doing this here since it sits the EventManager.OnMakeRootAgent event
             // is on the critical path for transferring an avatar from one region to another.

OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs

@@ -50,10 +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
+        IUserManagement UserManagementModule
         {
             get
             {
@@ -63,9 +61,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             }
         }
 
-        protected HGFriendsServicesConnector m_HGFriendsConnector = new HGFriendsServicesConnector();
-        protected HGStatusNotifier m_StatusNotifier;
-
         #region ISharedRegionModule
         public override string Name
         {
@@ -81,29 +76,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             scene.RegisterModuleInterface<IFriendsSimConnector>(this);
         }
 
-        public override void RegionLoaded(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-            if (m_StatusNotifier == null)
-                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
@@ -122,35 +94,6 @@ 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
@@ -248,6 +191,91 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetOnlineFriends for {0}", userID);
         }
 
+        //protected override void GetOnlineFriends(UUID userID, List<string> friendList, /*collector*/ List<UUID> online)
+        //{
+        //    // Let's single out the UUIs
+        //    List<string> localFriends = new List<string>();
+        //    List<string> foreignFriends = new List<string>();
+        //    string tmp = string.Empty;
+
+        //    foreach (string s in friendList)
+        //    {
+        //        UUID id;
+        //        if (UUID.TryParse(s, out id))
+        //            localFriends.Add(s);
+        //        else if (Util.ParseUniversalUserIdentifier(s, out id, out tmp, out tmp, out tmp, out tmp))
+        //        {
+        //            foreignFriends.Add(s);
+        //            // add it here too, who knows maybe the foreign friends happens to be on this grid
+        //            localFriends.Add(id.ToString());
+        //        }
+        //    }
+
+        //    // OK, see who's present on this grid
+        //    List<string> toBeRemoved = new List<string>();
+        //    PresenceInfo[] presence = PresenceService.GetAgents(localFriends.ToArray());
+        //    foreach (PresenceInfo pi in presence)
+        //    {
+        //        UUID presenceID;
+        //        if (UUID.TryParse(pi.UserID, out presenceID))
+        //        {
+        //            online.Add(presenceID);
+        //            foreach (string s in foreignFriends)
+        //                if (s.StartsWith(pi.UserID))
+        //                    toBeRemoved.Add(s);
+        //        }
+        //    }
+
+        //    foreach (string s in toBeRemoved)
+        //        foreignFriends.Remove(s);
+
+        //    // OK, let's send this up the stack, and leave a closure here
+        //    // collecting online friends in other grids
+        //    Util.FireAndForget(delegate { CollectOnlineFriendsElsewhere(userID, foreignFriends); });
+
+        //}
+
+        //private void CollectOnlineFriendsElsewhere(UUID userID, List<string> foreignFriends)
+        //{
+        //    // let's divide the friends on a per-domain basis
+        //    Dictionary<string, List<string>> friendsPerDomain = new Dictionary<string, List<string>>();
+        //    foreach (string friend in foreignFriends)
+        //    {
+        //        UUID friendID;
+        //        if (!UUID.TryParse(friend, out friendID))
+        //        {
+        //            // it's a foreign friend
+        //            string url = string.Empty, tmp = string.Empty;
+        //            if (Util.ParseUniversalUserIdentifier(friend, out friendID, out url, out tmp, out tmp, out tmp))
+        //            {
+        //                if (!friendsPerDomain.ContainsKey(url))
+        //                    friendsPerDomain[url] = new List<string>();
+        //                friendsPerDomain[url].Add(friend);
+        //            }
+        //        }
+        //    }
+
+        //    // Now, call those worlds
+            
+        //    foreach (KeyValuePair<string, List<string>> kvp in friendsPerDomain)
+        //    {
+        //        List<string> ids = new List<string>();
+        //        foreach (string f in kvp.Value)
+        //            ids.Add(f);
+        //        UserAgentServiceConnector uConn = new UserAgentServiceConnector(kvp.Key);
+        //        List<UUID> online = uConn.GetOnlineFriends(userID, ids);
+        //        // Finally send the notifications to the user
+        //        // this whole process may take a while, so let's check at every
+        //        // iteration that the user is still here
+        //        IClientAPI client = LocateClientObject(userID);
+        //        if (client != null)
+        //            client.SendAgentOnline(online.ToArray());
+        //        else
+        //            break;
+        //    }
+
+        //}
+
         protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID);
@@ -285,7 +313,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (friendsPerDomain.ContainsKey("local"))
                 base.StatusNotify(friendsPerDomain["local"], userID, online);
 
-            m_StatusNotifier.Notify(userID, friendsPerDomain, online);
+            foreach (KeyValuePair<string, List<FriendInfo>> kvp in friendsPerDomain)
+            {
+                if (kvp.Key != "local")
+                {
+                    // For the others, call the user agent service 
+                    List<string> ids = new List<string>();
+                    foreach (FriendInfo f in kvp.Value)
+                        ids.Add(f.Friend);
+                    UserAgentServiceConnector uConn = new UserAgentServiceConnector(kvp.Key);
+                    List<UUID> friendsOnline = uConn.StatusNotification(ids, userID, online);
+
+                    if (online && friendsOnline.Count > 0)
+                    {
+                        IClientAPI client = LocateClientObject(userID);
+                        if (client != null)
+                            client.SendAgentOnline(friendsOnline.ToArray());
+                    }
+                }
+            }
 
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting StatusNotify for {0}", userID);
         }
@@ -297,34 +343,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return true;
 
             // fid is not a UUID...
-            string url = string.Empty, tmp = string.Empty, f = string.Empty, l = string.Empty;
-            if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out f, out l, out tmp))
+            string url = string.Empty, tmp = string.Empty;
+            if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out first, out last, out tmp))
             {
-                if (!agentID.Equals(UUID.Zero))
-                {
-                    m_uMan.AddUser(agentID, f, l, url);
+                IUserManagement userMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                userMan.AddUser(agentID, first, last, url);
 
-                    string name = m_uMan.GetUserName(agentID);
-                    string[] parts = name.Trim().Split(new char[] { ' ' });
-                    if (parts.Length == 2)
-                    {
-                        first = parts[0];
-                        last = parts[1];
-                    }
-                    else
-                    {
-                        first = f;
-                        last = l;
-                    }
-                    return true;
-                }
+                return true;
             }
             return false;
         }
 
         protected override string GetFriendshipRequesterName(UUID agentID)
         {
-            return m_uMan.GetUserName(agentID);
+            // For the time being we assume that HG friendship requests can only happen 
+            // when avies are on the same region.
+            IClientAPI client = LocateClientObject(agentID);
+            if (client != null)
+                return client.FirstName + " " + client.LastName;
+            else
+                return base.GetFriendshipRequesterName(agentID);
         }
 
         protected override string FriendshipMessage(string friendID)
@@ -361,10 +399,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
             if (agentClientCircuit != null)
             {
-                //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
+                string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
 
-                finfos = FriendsService.GetFriends(client.AgentId.ToString());
-                m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
+                finfos = FriendsService.GetFriends(agentUUI);
+                m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, agentUUI);
             }
 
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
@@ -415,26 +453,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override void StoreBackwards(UUID friendID, UUID agentID)
         {
-            bool agentIsLocal = true;
-//            bool friendIsLocal = true;
-
+            Boolean agentIsLocal = true;
+            Boolean friendIsLocal = true;
             if (UserManagementModule != null)
             {
                 agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
-//                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
             }
 
-            // Is the requester a local user?
-            if (agentIsLocal)
+            // Are they both local users?
+            if (agentIsLocal && friendIsLocal)
             {
                 // local grid users
-                m_log.DebugFormat("[HGFRIENDS MODULE]: Friendship requester is local. Storing backwards.");
-
+                m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
                 base.StoreBackwards(friendID, agentID);
                 return;
             }
 
-            // no provision for this temporary friendship state when user is not local
+            // no provision for this temporary friendship state
             //FriendsService.StoreFriend(friendID.ToString(), agentID.ToString(), 0);
         }
 
@@ -472,14 +508,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode);
                 agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
                 agentFriendService = agentClientCircuit.ServiceURLs["FriendsServerURI"].ToString();
-                RecacheFriends(agentClient);
             }
             if (friendClient != null)
             {
                 friendClientCircuit = ((Scene)(friendClient.Scene)).AuthenticateHandler.GetAgentCircuitData(friendClient.CircuitCode);
                 friendUUI = Util.ProduceUserUniversalIdentifier(friendClientCircuit);
                 friendFriendService = friendClientCircuit.ServiceURLs["FriendsServerURI"].ToString();
-                RecacheFriends(friendClient);
             }
 
             m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
@@ -488,9 +522,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             // Generate a random 8-character hex number that will sign this friendship
             string secret = UUID.Random().ToString().Substring(0, 8);
 
-            string theFriendUUID = friendUUI + ";" + secret;
-            string agentUUID = agentUUI + ";" + secret;
-
             if (agentIsLocal) // agent is local, 'friend' is foreigner
             {
                 // This may happen when the agent returned home, in which case the friend is not there
@@ -500,6 +531,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 if (friendUUI == string.Empty)
                 {
                     finfos = GetFriendsFromCache(agentID);
+
                     foreach (FriendInfo finfo in finfos)
                     {
                         if (finfo.TheirFlags == -1)
@@ -507,61 +539,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                             if (finfo.Friend.StartsWith(friendID.ToString()))
                             {
                                 friendUUI = finfo.Friend;
-                                theFriendUUID = friendUUI;
-                                UUID utmp = UUID.Zero;
-                                string url = String.Empty;
-                                string first = String.Empty;
-                                string last = String.Empty;
-
-                                // If it's confirming the friendship, we already have the full UUI with the secret
-                                if (Util.ParseUniversalUserIdentifier(theFriendUUID, out utmp, out url, out first, out last, out secret))
-                                {
-                                    agentUUID = agentUUI + ";" + secret;
-                                    m_uMan.AddUser(utmp, first, last, url);
-                                }
                                 confirming = true;
-                                break;
                             }
                         }
                     }
-                    if (!confirming)
-                    {
-                        friendUUI = m_uMan.GetUserUUI(friendID);
-                        theFriendUUID = friendUUI + ";" + secret;
-                    }
+                }
 
-                    friendFriendService = m_uMan.GetUserServerURL(friendID, "FriendsServerURI");
-
-        //            m_log.DebugFormat("[HGFRIENDS MODULE] HG Friendship! thisUUI={0}; friendUUI={1}; foreignThisFriendService={2}; foreignFriendFriendService={3}",
-        //              agentUUI, friendUUI, agentFriendService, friendFriendService);
-
-                }                
-                
-                // Delete any previous friendship relations
-                DeletePreviousRelations(agentID, friendID);
+                // If it's confirming the friendship, we already have the full friendUUI with the secret
+                string theFriendUUID = confirming ? friendUUI : friendUUI + ";" + secret;
 
                 // store in the local friends service a reference to the foreign friend
                 FriendsService.StoreFriend(agentID.ToString(), theFriendUUID, 1);
                 // and also the converse
                 FriendsService.StoreFriend(theFriendUUID, agentID.ToString(), 1);
 
-                //if (!confirming)
-                //{
+                if (!confirming && friendClientCircuit != null)
+                {
                     // store in the foreign friends service a reference to the local agent
-                    HGFriendsServicesConnector friendsConn = null;
-                    if (friendClientCircuit != null) // the friend is here, validate session
-                        friendsConn = new HGFriendsServicesConnector(friendFriendService, friendClientCircuit.SessionID, friendClientCircuit.ServiceSessionID);
-                    else // the friend is not here, he initiated the request in his home world
-                        friendsConn = new HGFriendsServicesConnector(friendFriendService);
-
-                    friendsConn.NewFriendship(friendID, agentUUID);
-                //}
+                    HGFriendsServicesConnector friendsConn = new HGFriendsServicesConnector(friendFriendService, friendClientCircuit.SessionID, friendClientCircuit.ServiceSessionID);
+                    friendsConn.NewFriendship(friendID, agentUUI + ";" + secret);
+                }
             }
             else if (friendIsLocal) // 'friend' is local,  agent is foreigner
             {
-                // Delete any previous friendship relations
-                DeletePreviousRelations(agentID, friendID);
-
                 // store in the local friends service a reference to the foreign agent
                 FriendsService.StoreFriend(friendID.ToString(), agentUUI + ";" + secret, 1);
                 // and also the converse
@@ -591,36 +591,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             // my brain hurts now
         }
 
-        private void DeletePreviousRelations(UUID a1, UUID a2)
-        {
-            // Delete any previous friendship relations
-            FriendInfo[] finfos = null;
-            FriendInfo f = null;
-            finfos = GetFriendsFromCache(a1);
-            if (finfos != null)
-            {
-                f = GetFriend(finfos, a2);
-                if (f != null)
-                {
-                    FriendsService.Delete(a1, f.Friend);
-                    // and also the converse
-                    FriendsService.Delete(f.Friend, a1.ToString());
-                }
-            }
-
-            finfos = GetFriendsFromCache(a2);
-            if (finfos != null)
-            {
-                f = GetFriend(finfos, a1);
-                if (f != null)
-                {
-                    FriendsService.Delete(a2, f.Friend);
-                    // and also the converse
-                    FriendsService.Delete(f.Friend, a2.ToString());
-                }
-            }
-        }
-
         protected override bool DeleteFriendship(UUID agentID, UUID exfriendID)
         {
             Boolean agentIsLocal = true;
@@ -723,80 +693,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 friendConn.DeleteFriendship(foreignUser, localUser, secret);
             }
         }
-
-        protected override bool ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
-        {
-            if (base.ForwardFriendshipOffer(agentID, friendID, im))
-                return true;
-
-            // OK, that didn't work, so let's try to find this user somewhere
-            if (!m_uMan.IsLocalGridUser(friendID))
-            {
-                string friendsURL = m_uMan.GetUserServerURL(friendID, "FriendsServerURI");
-                if (friendsURL != string.Empty)
-                {
-                    m_log.DebugFormat("[HGFRIENDS MODULE]: Forwading friendship from {0} to {1} @ {2}", agentID, friendID, friendsURL);
-                    GridRegion region = new GridRegion();
-                    region.ServerURI = friendsURL;
-                    
-                    string name = im.fromAgentName;
-                    if (m_uMan.IsLocalGridUser(agentID))
-                    {
-                        IClientAPI agentClient = LocateClientObject(agentID);
-                        AgentCircuitData agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode);
-                        string agentHomeService = string.Empty;
-                        try
-                        {
-                            agentHomeService = agentClientCircuit.ServiceURLs["HomeURI"].ToString();
-                            string lastname = "@" + new Uri(agentHomeService).Authority;
-                            string firstname = im.fromAgentName.Replace(" ", ".");
-                            name = firstname + lastname;
-                        }
-                        catch (KeyNotFoundException)
-                        {
-                            m_log.DebugFormat("[HGFRIENDS MODULE]: Key HomeURI not found for user {0}", agentID);
-                            return false;
-                        }
-                        catch (NullReferenceException)
-                        {
-                            m_log.DebugFormat("[HGFRIENDS MODULE]: Null HomeUri for local user {0}", agentID);
-                            return false;
-                        }
-                        catch (UriFormatException)
-                        {
-                            m_log.DebugFormat("[HGFRIENDS MODULE]: Malformed HomeUri {0} for local user {1}", agentHomeService, agentID);
-                            return false;
-                        }
-                    }
-
-                    m_HGFriendsConnector.FriendshipOffered(region, agentID, friendID, im.message, name);
-                 
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public override bool LocalFriendshipOffered(UUID toID, GridInstantMessage im)
-        {
-            if (base.LocalFriendshipOffered(toID, im))
-            {
-                if (im.fromAgentName.Contains("@"))
-                {
-                    string[] parts = im.fromAgentName.Split(new char[] { '@' });
-                    if (parts.Length == 2)
-                    {
-                        string[] fl = parts[0].Trim().Split(new char[] { '.' });
-                        if (fl.Length == 2)
-                            m_uMan.AddUser(new UUID(im.fromAgentID), fl[0], fl[1], "http://" + parts[1]);
-                        else
-                            m_uMan.AddUser(new UUID(im.fromAgentID), fl[0], "", "http://" + parts[1]);
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
     }
 }

OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Connectors.Hypergrid;
-using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
-
-using OpenMetaverse;
-
-using log4net;
-
-namespace OpenSim.Region.CoreModules.Avatar.Friends
-{
-    public class HGStatusNotifier
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private HGFriendsModule m_FriendsModule;
-
-        public HGStatusNotifier(HGFriendsModule friendsModule)
-        {
-            m_FriendsModule = friendsModule;
-        }
-
-        public void Notify(UUID userID, Dictionary<string, List<FriendInfo>> friendsPerDomain, bool online)
-        {
-            foreach (KeyValuePair<string, List<FriendInfo>> kvp in friendsPerDomain)
-            {
-                if (kvp.Key != "local")
-                {
-                    // For the others, call the user agent service 
-                    List<string> ids = new List<string>();
-                    foreach (FriendInfo f in kvp.Value)
-                        ids.Add(f.Friend);
-
-                    if (ids.Count == 0)
-                        continue; // no one to notify. caller don't do this
-
-                    m_log.DebugFormat("[HG STATUS NOTIFIER]: Notifying {0} friends in {1}", ids.Count, kvp.Key);
-                    // ASSUMPTION: we assume that all users for one home domain
-                    // have exactly the same set of service URLs.
-                    // If this is ever not true, we need to change this.
-                    UUID friendID = UUID.Zero; String tmp = String.Empty;
-                    if (Util.ParseUniversalUserIdentifier(ids[0], out friendID, out tmp, out tmp, out tmp, out tmp))
-                    {
-                        string friendsServerURI = m_FriendsModule.UserManagementModule.GetUserServerURL(friendID, "FriendsServerURI");
-                        if (friendsServerURI != string.Empty)
-                        {
-                            HGFriendsServicesConnector fConn = new HGFriendsServicesConnector(friendsServerURI);
-
-                            List<UUID> friendsOnline = fConn.StatusNotification(ids, userID, online);
-
-                            if (online && friendsOnline.Count > 0)
-                            {
-                                IClientAPI client = m_FriendsModule.LocateClientObject(userID);
-                                if (client != null)
-                                    client.SendAgentOnline(friendsOnline.ToArray());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs

@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
 
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnClientClosed += OnClientClosed;
-            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+//            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
         }
 
         public void PostInitialise()
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
         private void OnNewClient(IClientAPI client)
         {
             // Subscribe to instant messages
-            client.OnInstantMessage += OnInstantMessage;
+//            client.OnInstantMessage += OnInstantMessage;
             client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
             client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
             lock (m_ClientMap)
@@ -171,15 +171,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                                              ActiveGroupTitle);
         }
 
-        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
-        {
-        }
+//        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
+//        {
+//        }
 
-        private void OnGridInstantMessage(GridInstantMessage msg)
-        {
-            // Trigger the above event handler
-            OnInstantMessage(null, msg);
-        }
+//        private void OnGridInstantMessage(GridInstantMessage msg)
+//        {
+//            // Trigger the above event handler
+//            OnInstantMessage(null, msg);
+//        }
 
         private void HandleUUIDGroupNameRequest(UUID id,IClientAPI remote_client)
         {

OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs

@@ -137,15 +137,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (Scene scene in m_Scenes)
             {
 //                m_log.DebugFormat(
-//                    "[INSTANT MESSAGE]: Looking for root agent {0} in {1}",
+//                    "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", 
 //                    toAgentID.ToString(), scene.RegionInfo.RegionName);
-
                 ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null && !sp.IsChildAgent)
                 {
                     // Local message
-                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", sp.Name, toAgentID);
-
+//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -157,15 +155,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             // try child avatar second
             foreach (Scene scene in m_Scenes)
             {
-                m_log.DebugFormat(
-                    "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
-
+//                m_log.DebugFormat(
+//                    "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
                 ScenePresence sp = scene.GetScenePresence(toAgentID);
                 if (sp != null)
                 {
                     // Local message
-                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", sp.Name, toAgentID);
-
+//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -174,9 +170,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
-            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
-
+//            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
             SendGridInstantMessageViaXMLRPC(im, result);
+
+            return;
         }
 
         private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs

@@ -39,9 +39,6 @@ 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
 {
@@ -94,7 +91,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,
@@ -102,7 +99,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 scene,
                 userInfo,
                 invPath,
-                new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression))
+                new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress))
         {
         }
 
@@ -110,7 +107,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;
@@ -128,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             Exception reportedException = null;
             bool succeeded = true;
-
+             
             try
             {
                 m_archiveWriter.Close();
@@ -149,21 +146,6 @@ 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}",
@@ -193,27 +175,12 @@ 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);
@@ -222,7 +189,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)
@@ -249,16 +216,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)
@@ -266,13 +233,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)
@@ -282,42 +249,41 @@ 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.");
-
                 // Write out control file.  This has to be done first so that subsequent loaders will see this file first
                 // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this
                 // not sure how to fix this though, short of going with a completely different file format.
                 m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options));
-
+                m_log.InfoFormat("[INVENTORY ARCHIVER]: Added control file to archive.");
+                
                 if (inventoryFolder != null)
                 {
                     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);
                 }
@@ -326,10 +292,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();
 
@@ -388,7 +354,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)
@@ -402,7 +368,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)
@@ -448,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public string CreateControlFile(Dictionary<string, object> options)
         {
             int majorVersion, minorVersion;
-
+            
             if (options.ContainsKey("home"))
             {
                 majorVersion = 1;
@@ -458,10 +424,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;
@@ -483,4 +449,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             return s;
         }
     }
-}
+}

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] [-e|--exclude=<name/uuid>] [-f|--excludefolder=<foldername/uuid>] [-v|--verbose]",
-                    "Save user inventory archive (IAR).",
+                    "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-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,34 +131,32 @@ 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)
         {
@@ -166,7 +164,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)
@@ -190,7 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-
+                    
                         return true;
 //                    }
 //                    else
@@ -204,15 +202,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))
@@ -230,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-
+                    
                         return true;
 //                    }
 //                    else
@@ -241,7 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //                    }
                 }
             }
-
+            
             return false;
         }
 
@@ -249,9 +247,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)
@@ -297,22 +295,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);
@@ -326,7 +324,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                             return false;
                         }
-
+                        
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -342,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             return false;
         }
-
+        
         /// <summary>
         /// Load inventory from an inventory file archive
         /// </summary>
@@ -353,26 +351,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}",
@@ -383,7 +381,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
             }
         }
-
+        
         /// <summary>
         /// Save inventory to a file archive
         /// </summary>
@@ -400,18 +398,6 @@ 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);
 
@@ -420,10 +406,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[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]");
+                        "[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]");
                     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");
 
@@ -432,7 +418,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);
@@ -447,9 +433,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)
@@ -459,7 +445,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);
@@ -467,11 +453,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>
@@ -481,13 +467,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;
             }
@@ -502,7 +488,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;
                 }
@@ -513,7 +499,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
         }
-
+        
         /// <summary>
         /// Notify the client of loaded nodes if they are logged in
         /// </summary>
@@ -522,22 +508,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;
                 }
             }
@@ -552,7 +538,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //        {
 //            if (DisablePresenceChecks)
 //                return true;
-//
+//            
 //            foreach (Scene scene in m_scenes.Values)
 //            {
 //                ScenePresence p;

OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs

@@ -297,9 +297,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
-            else if (
-                im.dialog == (byte)InstantMessageDialog.InventoryDeclined
-                || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined)
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
             {
                 // Here, the recipient is local and we can assume that the
                 // inventory is loaded. Courtesy of the above bulk update,

OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs

@@ -57,6 +57,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
         public void Initialise(IConfigSource config)
         {
+            // This can be reduced later as the loader will determine 
+            // whether we are needed
+            if (config.Configs["Profile"] != null)
+            {
+                if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule")
+                    return;
+            }
+
             m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
             m_Enabled = true;
         }

OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

@@ -168,12 +168,6 @@ 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;
 
@@ -1229,7 +1223,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             return agent;
         }
-         
+
         private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
         {
             CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
@@ -2048,4 +2042,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion
 
     }
-}
+}

OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs

@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Reflection;
 
 using OpenSim.Framework;
-using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Connectors.Hypergrid;
@@ -75,6 +74,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         m_levelHGTeleport = transferConfig.GetInt("LevelHGTeleport", 0);
 
                     InitialiseCommon(source);
+
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
             }
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 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";
+                    reason = "HyperGrid teleport not permitted";
                     return false;
                 }
 
@@ -372,4 +372,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return region;
         }
     }
-}
+}

OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs

@@ -364,7 +364,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         m_log.DebugFormat("[HG INVENTORY ACCESS MODULE]: Changing root inventory for user {0}", client.Name);
                         InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID);
-
+                        List<UUID> fids = new List<UUID>();
+                        List<UUID> iids = new List<UUID>();
                         List<InventoryFolderBase> keep = new List<InventoryFolderBase>();
 
                         foreach (InventoryFolderBase f in content.Folders)
@@ -394,4 +395,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         #endregion
     }
-}
+}

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -204,8 +204,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                     AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
                     m_Scene.AssetService.Store(asset);
-
-                    m_Scene.CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
+                    m_Scene.CreateNewInventoryItem(
+                        remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
+                        name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
                 }
                 else
                 {
@@ -947,11 +948,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
                     remoteClient.SendBulkUpdateInventory(item);
 
-                ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
-                remoteClient.SendAlertMessage(string.Format(
-                    "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
-                    item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.RegionInfo.RegionName));
-
                 return false;
             }
 

OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs

@@ -1,161 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Connectors.Hypergrid;
-
-using OpenMetaverse;
-using OpenMetaverse.Packets;
-using log4net;
-using Nini.Config;
-
-namespace OpenSim.Region.CoreModules.Framework.UserManagement
-{
-    public class HGUserManagementModule : UserManagementModule, ISharedRegionModule, IUserManagement
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-
-        #region ISharedRegionModule
-
-        public new void Initialise(IConfigSource config)
-        {
-            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name);
-            if (umanmod == Name)
-            {
-                m_Enabled = true;
-                RegisterConsoleCmds();
-                m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
-            }
-        }
-
-        public override string Name
-        {
-            get { return "HGUserManagementModule"; }
-        }
-
-        #endregion ISharedRegionModule
-
-        protected override void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
-        {
-            if (query.Contains("@"))  // First.Last@foo.com, maybe?
-            {
-                string[] words = query.Split(new char[] { '@' });
-                if (words.Length != 2)
-                {
-                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Malformed address {0}", query);
-                    return;
-                }
-
-                words[0] = words[0].Trim(); // it has at least 1
-                words[1] = words[1].Trim();
-
-                if (words[0] == String.Empty) // query was @foo.com?
-                {
-                    foreach (UserData d in m_UserCache.Values)
-                    {
-                        if (d.LastName.ToLower().StartsWith("@" + words[1].ToLower()))
-                            users.Add(d);
-                    }
-
-                    // We're done
-                    return;
-                }
-
-                // words.Length == 2 and words[0] != string.empty
-                // first.last@foo.com ?
-                foreach (UserData d in m_UserCache.Values)
-                {
-                    if (d.LastName.StartsWith("@") &&
-                        d.FirstName.ToLower().Equals(words[0].ToLower()) &&
-                        d.LastName.ToLower().Equals("@" + words[1].ToLower()))
-                    {
-                        users.Add(d);
-                        // It's cached. We're done
-                        return;
-                    }
-                }
-
-                // This is it! Let's ask the other world
-                if (words[0].Contains(".")) 
-                {
-                    string[] names = words[0].Split(new char[] { '.' });
-                    if (names.Length >= 2)
-                    {
-
-                        string uriStr = "http://" + words[1];
-                        // Let's check that the last name is a valid address
-                        try
-                        {
-                            new Uri(uriStr);
-                        }
-                        catch (UriFormatException)
-                        {
-                            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Malformed address {0}", uriStr);
-                            return;
-                        }
-
-                        UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr);
-                        UUID userID = uasConn.GetUUID(names[0], names[1]);
-                        if (!userID.Equals(UUID.Zero))
-                        {
-                            UserData ud = new UserData();
-                            ud.Id = userID;
-                            ud.FirstName = words[0];
-                            ud.LastName = "@" + words[1];
-                            users.Add(ud);
-                            AddUser(userID, names[0], names[1], uriStr);
-                            m_log.DebugFormat("[USER MANAGEMENT MODULE]: User {0}@{1} found", words[0], words[1]);
-                        }
-                        else
-                            m_log.DebugFormat("[USER MANAGEMENT MODULE]: User {0}@{1} not found", words[0], words[1]);
-                    }
-                }
-            }
-            //else
-            //{
-            //    foreach (UserData d in m_UserCache.Values)
-            //    {
-            //        if (d.LastName.StartsWith("@") && 
-            //            (d.FirstName.ToLower().StartsWith(query.ToLower()) || 
-            //             d.LastName.ToLower().StartsWith(query.ToLower())))
-            //            users.Add(d);
-            //    }
-            //}
-        }
-
-    }
-}

OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs

@@ -38,13 +38,12 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors.Hypergrid;
 
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
-    public class UserData
+    class UserData
     {
         public UUID Id { get; set; }
         public string FirstName { get; set; }
@@ -57,23 +56,36 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected bool m_Enabled;
-        protected List<Scene> m_Scenes = new List<Scene>();
+        private List<Scene> m_Scenes = new List<Scene>();
 
         // The cache
-        protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
+        Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
         {
-            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name);
-            if (umanmod == Name)
-            {
-                m_Enabled = true;
-                RegisterConsoleCmds();
-                m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
-            }
+            //m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled);
+            //if (m_Enabled)
+            //{
+            //    IConfig libConfig = config.Configs["LibraryService"];
+            //    if (libConfig != null)
+            //    {
+            //        string dllName = libConfig.GetString("LocalServiceModule", string.Empty);
+            //        m_log.Debug("[LIBRARY MODULE]: Library service dll is " + dllName);
+            //        if (dllName != string.Empty)
+            //        {
+            //            Object[] args = new Object[] { config };
+            //            m_Library = ServerUtils.LoadPlugin<ILibraryService>(dllName, args);
+            //        }
+            //    }
+            //}
+            MainConsole.Instance.Commands.AddCommand("Users", true,
+                "show names",
+                "show names",
+                "Show the bindings between user UUIDs and user names",
+                String.Empty,
+                HandleShowUsers);
         }
 
         public bool IsSharedModule
@@ -81,9 +93,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             get { return true; }
         }
 
-        public virtual string Name
+        public string Name
         {
-            get { return "BasicUserManagementModule"; }
+            get { return "UserManagement Module"; }
         }
 
         public Type ReplaceableInterface
@@ -93,23 +105,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void AddRegion(Scene scene)
         {
-            if (m_Enabled)
-            {
-                m_Scenes.Add(scene);
+            m_Scenes.Add(scene);
 
-                scene.RegisterModuleInterface<IUserManagement>(this);
-                scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
-                scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
-            }
+            scene.RegisterModuleInterface<IUserManagement>(this);
+            scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
+            scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
         }
 
         public void RemoveRegion(Scene scene)
         {
-            if (m_Enabled)
-            {
-                scene.UnregisterModuleInterface<IUserManagement>(this);
-                m_Scenes.Remove(scene);
-            }
+            scene.UnregisterModuleInterface<IUserManagement>(this);
+            m_Scenes.Remove(scene);
         }
 
         public void RegionLoaded(Scene s)
@@ -143,15 +149,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         void EventManager_OnNewClient(IClientAPI client)
         {
-            client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed);
             client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest);
-            client.OnAvatarPickerRequest += new AvatarPickerRequest(HandleAvatarPickerRequest);
-        }
-
-        void HandleConnectionClosed(IClientAPI client)
-        {
-            client.OnNameFromUUIDRequest -= new UUIDNameRequest(HandleUUIDNameRequest);
-            client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest);
         }
 
         void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
@@ -172,77 +170,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
-        public void HandleAvatarPickerRequest(IClientAPI client, UUID avatarID, UUID RequestID, string query)
-        {
-            //EventManager.TriggerAvatarPickerRequest();
-
-            m_log.DebugFormat("[USER MANAGEMENT MODULE]: HandleAvatarPickerRequest for {0}", query);
-
-            List<UserAccount> accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
-
-            List<UserData> users = new List<UserData>();
-            if (accs != null)
-            {
-                foreach (UserAccount acc in accs)
-                {
-                    UserData ud = new UserData();
-                    ud.FirstName = acc.FirstName;
-                    ud.LastName = acc.LastName;
-                    ud.Id = acc.PrincipalID;
-                    users.Add(ud);
-                }
-            }
-
-            AddAdditionalUsers(avatarID, query, users);
-
-            AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
-            // TODO: don't create new blocks if recycling an old packet
-
-            AvatarPickerReplyPacket.DataBlock[] searchData =
-                new AvatarPickerReplyPacket.DataBlock[users.Count];
-            AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock();
-
-            agentData.AgentID = avatarID;
-            agentData.QueryID = RequestID;
-            replyPacket.AgentData = agentData;
-            //byte[] bytes = new byte[AvatarResponses.Count*32];
-
-            int i = 0;
-            foreach (UserData item in users)
-            {
-                UUID translatedIDtem = item.Id;
-                searchData[i] = new AvatarPickerReplyPacket.DataBlock();
-                searchData[i].AvatarID = translatedIDtem;
-                searchData[i].FirstName = Utils.StringToBytes((string)item.FirstName);
-                searchData[i].LastName = Utils.StringToBytes((string)item.LastName);
-                i++;
-            }
-            if (users.Count == 0)
-            {
-                searchData = new AvatarPickerReplyPacket.DataBlock[0];
-            }
-            replyPacket.Data = searchData;
-
-            AvatarPickerReplyAgentDataArgs agent_data = new AvatarPickerReplyAgentDataArgs();
-            agent_data.AgentID = replyPacket.AgentData.AgentID;
-            agent_data.QueryID = replyPacket.AgentData.QueryID;
-
-            List<AvatarPickerReplyDataArgs> data_args = new List<AvatarPickerReplyDataArgs>();
-            for (i = 0; i < replyPacket.Data.Length; i++)
-            {
-                AvatarPickerReplyDataArgs data_arg = new AvatarPickerReplyDataArgs();
-                data_arg.AvatarID = replyPacket.Data[i].AvatarID;
-                data_arg.FirstName = replyPacket.Data[i].FirstName;
-                data_arg.LastName = replyPacket.Data[i].LastName;
-                data_args.Add(data_arg);
-            }
-            client.SendAvatarPickerReply(agent_data, data_args);
-        }
-
-        protected virtual void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
-        {
-        }
-
         #endregion Event Handlers
 
         private void CacheCreators(SceneObjectGroup sog)
@@ -328,6 +255,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
+            //m_log.DebugFormat("[XXX] GetUserName {0}", uuid);
             string[] names = GetUserNames(uuid);
             if (names.Length == 2)
             {
@@ -368,9 +296,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                 if (userdata.HomeURL != null && userdata.HomeURL != string.Empty)
                 {
-                    //m_log.DebugFormat(
-                    //    "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
-                    //    serverType, userdata.HomeURL, userID);
+                    m_log.DebugFormat(
+                        "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
+                        serverType, userdata.HomeURL, userID);
 
                     UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL);
                     userdata.ServerURLs = uConn.GetServerURLs(userID);
@@ -429,15 +357,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void AddUser(UUID uuid, string first, string last, string homeURL)
         {
-            // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL);
-
             AddUser(uuid, homeURL + ";" + first + " " + last);
         }
 
         public void AddUser (UUID id, string creatorData)
         {
-            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
-
             UserData oldUser;
             //lock the whole block - prevent concurrent update
             lock (m_UserCache)
@@ -463,8 +387,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         return;
                     }
                 }
+//              m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
 
-                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id);
+                UserAccount account = m_Scenes [0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id);
 
                 if (account != null)
                 {
@@ -513,9 +438,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             lock (m_UserCache)
                 m_UserCache[user.Id] = user;
 
-            //m_log.DebugFormat(
-            //    "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}",
-            //    user.Id, user.FirstName, user.LastName, user.HomeURL);
+//            m_log.DebugFormat(
+//                "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}",
+//                user.Id, user.FirstName, user.LastName, user.HomeURL);
         }
 
         public bool IsLocalGridUser(UUID uuid)
@@ -529,23 +454,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion IUserManagement
 
-        protected void RegisterConsoleCmds()
-        {
-            MainConsole.Instance.Commands.AddCommand("Users", true,
-                "show names",
-                "show names",
-                "Show the bindings between user UUIDs and user names",
-                String.Empty,
-                HandleShowUsers);
-        }
-
         private void HandleShowUsers(string module, string[] cmd)
         {
             lock (m_UserCache)
             {
                 if (m_UserCache.Count == 0)
                 {
-                    MainConsole.Instance.Output("No users found");
+                    MainConsole.Instance.Output("No users not found");
                     return;
                 }
     

OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs

@@ -1,224 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using log4net;
-using Nini.Config;
-using Mono.Addins;
-
-using Caps = OpenSim.Framework.Capabilities.Caps;
-
-
-namespace OpenSim.Region.CoreModules.World.LightShare
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EnvironmentModule")]
-
-    public class EnvironmentModule : INonSharedRegionModule, IEnvironmentModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Scene m_scene = null;
-        private UUID regionID = UUID.Zero;
-        private static bool Enabled = false;
-        
-        private static readonly string capsName = "EnvironmentSettings";
-        private static readonly string capsBase = "/CAPS/0020/";
-        
-        private LLSDEnvironmentSetResponse setResponse = null;
-
-        #region INonSharedRegionModule
-        public void Initialise(IConfigSource source)
-        {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-
-            if (null == config)
-                return;
-
-            if (config.GetString("Cap_EnvironmentSettings", String.Empty) != "localhost")
-            {
-                m_log.InfoFormat("[{0}]: Module is disabled.", Name);
-                return;
-            }
-
-            Enabled = true;
-            
-            m_log.InfoFormat("[{0}]: Module is enabled.", Name);
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "EnvironmentModule"; }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!Enabled)
-                return;
-
-            scene.RegisterModuleInterface<IEnvironmentModule>(this);
-            m_scene = scene;
-            regionID = scene.RegionInfo.RegionID;
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!Enabled)
-                return;
-
-            setResponse = new LLSDEnvironmentSetResponse();
-            scene.EventManager.OnRegisterCaps += OnRegisterCaps;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (Enabled)
-                return;
-
-            scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
-            m_scene = null;
-        }
-        #endregion
-
-        #region IEnvironmentModule
-        public void ResetEnvironmentSettings(UUID regionUUID)
-        {
-            if (!Enabled)
-                return;
-
-            m_scene.SimulationDataService.RemoveRegionEnvironmentSettings(regionUUID);
-        }
-        #endregion
-
-        #region Events
-        private void OnRegisterCaps(UUID agentID, Caps caps)
-        {
-//            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
-
-            string capsPath = capsBase + UUID.Random();
-
-            // Get handler
-            caps.RegisterHandler(
-                capsName,
-                new RestStreamHandler(
-                    "GET",
-                    capsPath,
-                    (request, path, param, httpRequest, httpResponse)
-                     => GetEnvironmentSettings(request, path, param, agentID, caps),
-                     capsName,
-                     agentID.ToString()));
-
-            // Set handler
-            caps.HttpListener.AddStreamHandler(
-                new RestStreamHandler(
-                "POST",
-                capsPath,
-                (request, path, param, httpRequest, httpResponse)
-                 => SetEnvironmentSettings(request, path, param, agentID, caps),
-                 capsName,
-                 agentID.ToString()));
-        }
-        #endregion
-
-        private string GetEnvironmentSettings(string request, string path, string param,
-              UUID agentID, Caps caps)
-        {
-//            m_log.DebugFormat("[{0}]: Environment GET handle for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
-
-            string env = String.Empty;
-
-            try
-            {
-                env = m_scene.SimulationDataService.LoadRegionEnvironmentSettings(regionID);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[{0}]: Unable to load environment settings for region {1}, Exception: {2} - {3}",
-                    Name, caps.RegionName, e.Message, e.StackTrace);
-            }
-
-            if (String.IsNullOrEmpty(env))
-                env = EnvironmentSettings.EmptySettings(UUID.Zero, regionID);
-
-            return env;
-        }
-
-        private string SetEnvironmentSettings(string request, string path, string param,
-                              UUID agentID, Caps caps)
-        {
-
-//            m_log.DebugFormat("[{0}]: Environment SET handle from agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
-
-            setResponse.regionID = regionID;
-            setResponse.success = false;
-
-            if (!m_scene.Permissions.CanIssueEstateCommand(agentID, false))
-            {
-                setResponse.fail_reason = "Insufficient estate permissions, settings has not been saved.";
-                return LLSDHelpers.SerialiseLLSDReply(setResponse);
-            }
-
-            try
-            {
-                m_scene.SimulationDataService.StoreRegionEnvironmentSettings(regionID, request);
-                setResponse.success = true;
-                
-                m_log.InfoFormat("[{0}]: New Environment settings has been saved from agentID {1} in region {2}",
-                    Name, agentID, caps.RegionName);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[{0}]: Environment settings has not been saved for region {1}, Exception: {2} - {3}",
-                    Name, caps.RegionName, e.Message, e.StackTrace);
-
-                setResponse.success = false;
-                setResponse.fail_reason = String.Format("Environment Set for region {0} has failed, settings has not been saved.", caps.RegionName);
-            }
-
-            return LLSDHelpers.SerialiseLLSDReply(setResponse);
-        }
-    }
-}
-

OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml

@@ -9,7 +9,6 @@
 
     <Extension path = "/OpenSim/RegionModules">
         <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
-        <RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
         <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
         <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
         <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />

OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs

@@ -64,8 +64,6 @@ 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>();
@@ -129,7 +127,6 @@ 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)
             {
@@ -179,6 +176,18 @@ 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;
@@ -258,9 +267,10 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                 m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address);
                 return;
             }
-            if ((subject.Length + body.Length) > m_MaxEmailSize)
+            //FIXME:Check if subject + body = 4096 Byte
+            if ((subject.Length + body.Length) > 1024)
             {
-                m_log.Error("[EMAIL] subject + body larger than limit of " + m_MaxEmailSize + " bytes");
+                m_log.Error("[EMAIL] subject + body > 1024 Byte");
                 return;
             }
 
@@ -335,6 +345,10 @@ 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>

OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

@@ -124,10 +124,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         private IHttpServer m_HttpsServer = null;
 
         private string m_ExternalHostNameForLSL = "";
-        public string ExternalHostNameForLSL
-        {
-            get { return m_ExternalHostNameForLSL; } 
-        }
 
         public Type ReplaceableInterface 
         {
@@ -194,7 +190,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public void Close()
         {
         }
-
         public UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID)
         {
             UUID urlcode = UUID.Random();
@@ -224,10 +219,6 @@ 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 });
             }
 
@@ -269,10 +260,6 @@ 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 });
             }
 
@@ -293,10 +280,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 foreach (UUID req in data.requests.Keys)
                     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);
             }
@@ -622,4 +605,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             ScriptRemoved(itemID);
         }
     }
-}
+}

OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs

@@ -308,56 +308,56 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
+        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
         {
+            error = null;
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // 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
+                // Send message to avatar
                 if (channel == 0)
                 {
-                    m_scene.SimChatToAgent(target, Utils.StringToBytes(msg), pos, name, id, false);
-               }
-                else
-                {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
-
-                    // Get uuid of attachments
-                    List<UUID> targets = new List<UUID>();
-                    foreach (SceneObjectGroup sog in attachments)
-                    {
-                        if (!sog.IsDeleted)
-                            targets.Add(sog.UUID);
-                    }
-
-                    // 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 (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
-                            continue;
-
-                        if (targets.Contains(li.GetHostID()))
-                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                    }
+                    m_scene.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false);
                 }
 
-                return;
+                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)
+                {
+                    if (!sog.IsDeleted)
+                        targets.Add(sog.UUID);
+                }
+
+                // 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 (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                        continue;
+
+                    if (targets.Contains(li.GetHostID()))
+                        QueueMessage(new ListenerInfo(li, name, id, msg));
+                }
+
+                return true;
+            }
+
+            // Need to toss an error here
+            if (channel == 0)
+            {
+                error = "Cannot use llRegionSayTo to message objects on channel 0";
+                return false;
             }
 
-            // 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;
+            return true;
         }
 
         protected void QueueMessage(ListenerInfo li)

OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs

@@ -48,10 +48,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
         private static bool m_Enabled = false;
         
         private IConfigSource m_Config;
-        private bool m_Registered = false;
-        private string m_LocalServiceDll = String.Empty;
-        private GatekeeperServiceInConnector m_HypergridHandler;
-        private UserAgentServerConnector m_UASHandler;
+        bool m_Registered = false;
+        GatekeeperServiceInConnector m_HypergridHandler;
 
         #region IRegionModule interface
 
@@ -65,13 +63,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
                 if (m_Enabled)
                 {
                     m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled");
-                    IConfig fconfig = config.Configs["FriendsService"];
-                    if (fconfig != null)
-                    {
-                        m_LocalServiceDll = fconfig.GetString("LocalServiceModule", m_LocalServiceDll);
-                        if (m_LocalServiceDll == String.Empty)
-                            m_log.WarnFormat("[HGGRID IN CONNECTOR]: Friends LocalServiceModule config missing");
-                    }
                 }
 
             }
@@ -100,6 +91,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
         {
             if (!m_Enabled)
                 return;
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -120,21 +112,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
                 m_log.Info("[HypergridService]: Starting...");
 
                 ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
-                IFriendsSimConnector friendsConn = scene.RequestModuleInterface<IFriendsSimConnector>();
-                Object[] args = new Object[] { m_Config };
-//                IFriendsService friendsService = ServerUtils.LoadPlugin<IFriendsService>(m_LocalServiceDll, args)
-                ServerUtils.LoadPlugin<IFriendsService>(m_LocalServiceDll, args);
-
                 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
 
-                m_UASHandler = new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn);
-                
+                IFriendsSimConnector friendsConn = scene.RequestModuleInterface<IFriendsSimConnector>();
+                new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn);
                 new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService");
-
-                new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService", friendsConn);
+                new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService");
             }
             scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper);
-            scene.RegisterModuleInterface<IUserAgentService>(m_UASHandler.HomeUsersService);
         }
 
         #endregion

OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs

@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             
             m_aScene = scene;
 
-            m_aScene.RegisterModuleInterface<IAssetService>(this);
+            scene.RegisterModuleInterface<IAssetService>(this);
         }
 
         public void RemoveRegion(Scene scene)

OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs

@@ -73,17 +73,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                         return;
                     }
 
-                    string serviceDll = assetConfig.GetString("LocalServiceModule", String.Empty);
+                    string serviceDll = assetConfig.GetString("LocalServiceModule",
+                            String.Empty);
 
                     if (serviceDll == String.Empty)
                     {
                         m_log.Error("[LOCAL ASSET SERVICES CONNECTOR]: No LocalServiceModule named in section AssetService");
                         return;
                     }
-                    else
-                    {
-                        m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Loading asset service at {0}", serviceDll);
-                    }
 
                     Object[] args = new Object[] { source };
                     m_AssetService = ServerUtils.LoadPlugin<IAssetService>(serviceDll, args);

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs

@@ -253,5 +253,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             MainConsole.Instance.Output(caps.ToString());
         }
+
     }
-}
+}

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs

@@ -58,8 +58,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private List<Scene> m_Scenes = new List<Scene>();
 
-        private InventoryCache m_Cache = new InventoryCache();
-
         protected IUserManagement m_UserManagement;
         protected IUserManagement UserManagementModule
         {
@@ -297,35 +295,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_LocalGridInventoryService.CreateUserInventory(userID);
         }
 
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userID)
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
         {
-            string invURL = GetInventoryServiceURL(userID);
-
-            if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetInventorySkeleton(userID);
-
-            IInventoryService connector = GetConnector(invURL);
-
-            return connector.GetInventorySkeleton(userID);
+            return m_LocalGridInventoryService.GetInventorySkeleton(userId);
         }
 
         public InventoryCollection GetUserInventory(UUID userID)
         {
-            string invURL = GetInventoryServiceURL(userID);
-            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetUserInventory for {0} {1}", userID, invURL);
-
-            if (invURL == null) // not there, forward to local inventory connector to resolve
-                return m_LocalGridInventoryService.GetUserInventory(userID);
-
-            InventoryCollection c = m_Cache.GetUserInventory(userID);
-            if (c != null)
-                return c;
-
-            IInventoryService connector = GetConnector(invURL);
-            c = connector.GetUserInventory(userID);
-
-            m_Cache.Cache(userID, c);
-            return c;
+            return null;
         }
 
         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -335,9 +312,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public InventoryFolderBase GetRootFolder(UUID userID)
         {
             //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID);
-            InventoryFolderBase root = m_Cache.GetRootFolder(userID);
-            if (root != null)
-                return root;
 
             string invURL = GetInventoryServiceURL(userID);
 
@@ -346,19 +320,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             IInventoryService connector = GetConnector(invURL);
 
-            root = connector.GetRootFolder(userID);
-
-            m_Cache.Cache(userID, root);
-
-            return root;
+            return connector.GetRootFolder(userID);
         }
 
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
         {
             //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type);
-            InventoryFolderBase f = m_Cache.GetFolderForType(userID, type);
-            if (f != null)
-                return f;
 
             string invURL = GetInventoryServiceURL(userID);
 
@@ -367,11 +334,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             IInventoryService connector = GetConnector(invURL);
 
-            f = connector.GetFolderForType(userID, type);
-
-            m_Cache.Cache(userID, type, f);
-
-            return f;
+            return connector.GetFolderForType(userID, type);
         }
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
@@ -383,14 +346,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
 
-            InventoryCollection c = m_Cache.GetFolderContent(userID, folderID);
-            if (c != null)
-            {
-                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent found content in cache " + folderID);
-                return c;
-            }
-
             IInventoryService connector = GetConnector(invURL);
+
             return connector.GetFolderContent(userID, folderID);
 
         }
@@ -404,14 +361,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
 
-            List<InventoryItemBase> items = m_Cache.GetFolderItems(userID, folderID);
-            if (items != null)
-            {
-                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems found items in cache " + folderID);
-                return items;
-            }
-
             IInventoryService connector = GetConnector(invURL);
+
             return connector.GetFolderItems(userID, folderID);
 
         }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs

@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using OpenSim.Framework;
-using OpenMetaverse;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public class InventoryCache
-    {
-        private const double CACHE_EXPIRATION_SECONDS = 3600.0; // 1 hour
-
-        private static ExpiringCache<UUID, InventoryFolderBase> m_RootFolders = new ExpiringCache<UUID, InventoryFolderBase>();
-        private static ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>> m_FolderTypes = new ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>>();
-        private static ExpiringCache<UUID, InventoryCollection> m_Inventories = new ExpiringCache<UUID, InventoryCollection>();
-
-        public void Cache(UUID userID, InventoryFolderBase root)
-        {
-            lock (m_RootFolders)
-                m_RootFolders.AddOrUpdate(userID, root, CACHE_EXPIRATION_SECONDS);
-        }
-
-        public InventoryFolderBase GetRootFolder(UUID userID)
-        {
-            InventoryFolderBase root = null;
-            if (m_RootFolders.TryGetValue(userID, out root))
-                return root;
-
-            return null;
-        }
-
-        public void Cache(UUID userID, AssetType type, InventoryFolderBase folder)
-        {
-            lock (m_FolderTypes)
-            {
-                Dictionary<AssetType, InventoryFolderBase> ff = null;
-                if (!m_FolderTypes.TryGetValue(userID, out ff))
-                {
-                    ff = new Dictionary<AssetType, InventoryFolderBase>();
-                    m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
-                }
-                if (!ff.ContainsKey(type))
-                    ff.Add(type, folder);
-            }
-        }
-
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            Dictionary<AssetType, InventoryFolderBase> ff = null;
-            if (m_FolderTypes.TryGetValue(userID, out ff))
-            {
-                InventoryFolderBase f = null;
-                if (ff.TryGetValue(type, out f))
-                    return f;
-            }
-
-            return null;
-        }
-
-        public void Cache(UUID userID, InventoryCollection inv)
-        {
-            lock (m_Inventories)
-                m_Inventories.AddOrUpdate(userID, inv, 120);
-        }
-
-        public InventoryCollection GetUserInventory(UUID userID)
-        {
-            InventoryCollection inv = null;
-            if (m_Inventories.TryGetValue(userID, out inv))
-                return inv;
-            return null;
-        }
-
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
-        {
-            InventoryCollection inv = null;
-            InventoryCollection c;
-            if (m_Inventories.TryGetValue(userID, out inv))
-            {
-                c = new InventoryCollection();
-                c.UserID = userID;
-
-                c.Folders = inv.Folders.FindAll(delegate(InventoryFolderBase f)
-                {
-                    return f.ParentID == folderID;
-                });
-                c.Items = inv.Items.FindAll(delegate(InventoryItemBase i)
-                {
-                    return i.Folder == folderID;
-                });
-                return c;
-            }
-            return null;
-        }
-
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
-        {
-            InventoryCollection inv = null;
-            if (m_Inventories.TryGetValue(userID, out inv))
-            {
-                List<InventoryItemBase> items = inv.Items.FindAll(delegate(InventoryItemBase i)
-                {
-                    return i.Folder == folderID;
-                });
-                return items;
-            }
-            return null;
-        }
-    }
-}

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs

@@ -167,12 +167,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
         {
-            return m_RemoteConnector.GetInventorySkeleton(userId);
+            return new List<InventoryFolderBase>();
         }
 
         public  InventoryCollection GetUserInventory(UUID userID)
         {
-            return m_RemoteConnector.GetUserInventory(userID);
+            return null;
         }
 
         public  void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -193,17 +193,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
 
-            if (invCol != null && UserManager != null)
+            if (UserManager != null)
             {
                 // Protect ourselves against the caller subsequently modifying the items list
                 List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
 
-                if (items != null && items.Count > 0)
-                    Util.FireAndForget(delegate
-                    {
-                        foreach (InventoryItemBase item in items)
-                            UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                    });
+                Util.FireAndForget(delegate
+                {
+                    foreach (InventoryItemBase item in items)
+                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+                });
             }
 
             return invCol;

OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs

@@ -128,11 +128,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             m_enabled = true;
         }
 
-        ///<summary>
-        ///
-        ///</summary>
-
-
         ///<summary>
         ///
         ///</summary>
@@ -146,10 +141,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             lock (m_scenes)
                 m_scenes[scene.RegionInfo.RegionID] = scene;
 
-            scene.EventManager.OnLoginsEnabled += OnLoginsEnabled; 
+            scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
         }
 
-
         ///<summary>
         ///
         ///</summary>
@@ -163,21 +157,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         }
 
         #endregion ISharedRegionModule
-
-        void OnLoginsEnabled(string regionName)
-        {
-            Scene scene = null;
-            foreach (Scene s in m_scenes.Values)
-                if (s.RegionInfo.RegionName == regionName)
-                {
-                    scene = s;
-                    break;
-                }
-            if (scene != null)
-                UploadMapTile(scene);
-        }
-
-
+        
         ///<summary>
         ///
         ///</summary>

OpenSim/Region/CoreModules/World/Access/AccessModule.cs

@@ -129,18 +129,18 @@ namespace OpenSim.Region.CoreModules.World
             switch (cmd[1])
             {
             case "enable":
-                scene.LoginsDisabled = false;
+                scene.LoginsEnabled = true;
                 MainConsole.Instance.Output(String.Format("Logins are enabled for region {0}", scene.RegionInfo.RegionName));
                 break;
             case "disable":
-                scene.LoginsDisabled = true;
+                scene.LoginsEnabled = false;
                 MainConsole.Instance.Output(String.Format("Logins are disabled for region {0}", scene.RegionInfo.RegionName));
                 break;
             case "status":
-                if (scene.LoginsDisabled)
-                    MainConsole.Instance.Output(String.Format("Login in {0} are disabled", scene.RegionInfo.RegionName));
-                else
+                if (scene.LoginsEnabled)
                     MainConsole.Instance.Output(String.Format("Login in {0} are enabled", scene.RegionInfo.RegionName));
+                else
+                    MainConsole.Instance.Output(String.Format("Login in {0} are disabled", scene.RegionInfo.RegionName));
                 break;
             default:
                 MainConsole.Instance.Output("Syntax: login enable|disable|status");

OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs

@@ -246,8 +246,6 @@ 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;
 
@@ -269,21 +267,11 @@ 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)
@@ -342,14 +330,7 @@ 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);
-
-            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();
-            }
+                m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects);            
         }
         
         /// <summary>
@@ -525,10 +506,6 @@ 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();
 

OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs

@@ -108,14 +108,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                "[ARCHIVER]: Received {0} of {1} assets requested",
 //                assetsFoundUuids.Count, assetsFoundUuids.Count + assetsNotFoundUuids.Count);
 
-            m_log.InfoFormat("[ARCHIVER]: Adding region settings to archive.");
-
             // Write out region settings
             string settingsPath
                 = String.Format("{0}{1}.xml", ArchiveConstants.SETTINGS_PATH, m_scene.RegionInfo.RegionName);
             m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(m_scene.RegionInfo.RegionSettings));
 
-            m_log.InfoFormat("[ARCHIVER]: Adding parcel settings to archive.");
+            m_log.InfoFormat("[ARCHIVER]: Added region settings to archive.");
 
             // Write out land data (aka parcel) settings
             List<ILandObject>landObjects = m_scene.LandChannel.AllParcels();
@@ -126,8 +124,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                                     landData.GlobalID.ToString());
                 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData));
             }
-
-            m_log.InfoFormat("[ARCHIVER]: Adding terrain information to archive.");
+            m_log.InfoFormat("[ARCHIVER]: Added parcel settings to archive.");
 
             // Write out terrain
             string terrainPath
@@ -138,7 +135,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
             ms.Close();
 
-            m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
+            m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive.");
            
             // Write out scene object metadata
             foreach (SceneObjectGroup sceneObject in m_sceneObjects)
@@ -148,6 +145,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, m_options);                
                 m_archiveWriter.WriteFile(ArchiveHelpers.CreateObjectPath(sceneObject), serializedObject);
             }
+
+            m_log.InfoFormat("[ARCHIVER]: Added scene objects to archive.");
         }
+
+
     }
-}
+}

OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs

@@ -40,9 +40,6 @@ 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
 {
@@ -67,8 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// Determine whether this archive will save assets.  Default is true.
         /// </summary>
         public bool SaveAssets { get; set; }
-
-        protected ArchiverModule m_module;
+        
         protected Scene m_scene;
         protected Stream m_saveStream;
         protected Guid m_requestId;
@@ -76,17 +72,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="module">Calling module</param>
+        /// <param name="scene"></param>
         /// <param name="savePath">The path to which to save data.</param>
         /// <param name="requestId">The id associated with this request</param>
         /// <exception cref="System.IO.IOException">
         /// If there was a problem opening a stream for the file specified by the savePath
         /// </exception>
-        public ArchiveWriteRequestPreparation(ArchiverModule module, string savePath, Guid requestId) : this(module, requestId)
+        public ArchiveWriteRequestPreparation(Scene scene, string savePath, Guid requestId) : this(scene, requestId)
         {
             try
             {
-                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression);
+                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress);
             }
             catch (EntryPointNotFoundException e)
             {
@@ -100,23 +96,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Constructor.
         /// </summary>
-        /// <param name="module">Calling module</param>
+        /// <param name="scene"></param>
         /// <param name="saveStream">The stream to which to save data.</param>
         /// <param name="requestId">The id associated with this request</param>
-        public ArchiveWriteRequestPreparation(ArchiverModule module, Stream saveStream, Guid requestId) : this(module, requestId)
+        public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream, Guid requestId) : this(scene, requestId)
         {
             m_saveStream = saveStream;
         }
 
-        protected ArchiveWriteRequestPreparation(ArchiverModule module, Guid requestId)
+        protected ArchiveWriteRequestPreparation(Scene scene, Guid requestId)
         {
-            m_module = module;
-
-            // FIXME: This is only here for regression test purposes since they do not supply a module.  Need to fix
-            // this.
-            if (m_module != null)
-                m_scene = m_module.Scene;
-
+            m_scene = scene;
             m_requestId = requestId;
 
             SaveAssets = true;
@@ -229,19 +219,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
 
                 if (SaveAssets)
-                {
-                    AssetsRequest ar
-                        = new AssetsRequest(
-                            new AssetsArchiver(archiveWriter), assetUuids,
-                            m_scene.AssetService, m_scene.UserAccountService, 
-                            m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets);
-
-                    Util.FireAndForget(o => ar.Execute());
-                }
+                    new AssetsRequest(
+                        new AssetsArchiver(archiveWriter), assetUuids,
+                        m_scene.AssetService, m_scene.UserAccountService, 
+                        m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets).Execute();
                 else
-                {
                     awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
-                }
             }
             catch (Exception) 
             {
@@ -307,15 +290,10 @@ 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}, creator={8}, permitted={9}",
+                //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}",
                 //    name, obj.BaseMask, obj.OwnerMask, obj.EveryoneMask,
-                //    permissionClass, checkPermissions, canCopy, canTransfer, creator, partPermitted);
+                //    permissionClass, checkPermissions, canCopy, canTransfer, permitted);
 
                 if (!partPermitted)
                 {
@@ -335,7 +313,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <returns></returns>
         public string CreateControlFile(Dictionary<string, object> options)
         {
-            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 8;
+            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 7;
 //
 //            if (options.ContainsKey("version"))
 //            {
@@ -371,66 +349,32 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             //if (majorVersion == 1)
             //{
             //    m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier.  Please use the --version=0 option if you want to produce a compatible OAR");
-            //}
-
-            String s;
+            //}            
             
-            using (StringWriter sw = new StringWriter())
-            {
-                using (XmlTextWriter xtw = new XmlTextWriter(sw))
-                {
-                    xtw.Formatting = Formatting.Indented;
-                    xtw.WriteStartDocument();
-                    xtw.WriteStartElement("archive");
-                    xtw.WriteAttributeString("major_version", majorVersion.ToString());
-                    xtw.WriteAttributeString("minor_version", minorVersion.ToString());
-        
-                    xtw.WriteStartElement("creation_info");
-                    DateTime now = DateTime.UtcNow;
-                    TimeSpan t = now - new DateTime(1970, 1, 1);
-                    xtw.WriteElementString("datetime", ((int)t.TotalSeconds).ToString());
-                    xtw.WriteElementString("id", UUID.Random().ToString());
-                    xtw.WriteEndElement();
+            StringWriter sw = new StringWriter();
+            XmlTextWriter xtw = new XmlTextWriter(sw);
+            xtw.Formatting = Formatting.Indented;
+            xtw.WriteStartDocument();
+            xtw.WriteStartElement("archive");
+            xtw.WriteAttributeString("major_version", majorVersion.ToString());
+            xtw.WriteAttributeString("minor_version", minorVersion.ToString());
 
-                    xtw.WriteStartElement("region_info");
+            xtw.WriteStartElement("creation_info");
+            DateTime now = DateTime.UtcNow;
+            TimeSpan t = now - new DateTime(1970, 1, 1);
+            xtw.WriteElementString("datetime", ((int)t.TotalSeconds).ToString());
+            xtw.WriteElementString("id", UUID.Random().ToString());
+            xtw.WriteEndElement();
 
-                    bool isMegaregion;
-                    Vector2 size;
-                    IRegionCombinerModule rcMod = null;
+            xtw.WriteElementString("assets_included", SaveAssets.ToString());
 
-                    // FIXME: This is only here for regression test purposes since they do not supply a module.  Need to fix
-                    // this, possibly by doing control file creation somewhere else.
-                    if (m_module != null)
-                        rcMod = m_module.RegionCombinerModule;
+            xtw.WriteEndElement();
 
-                    if (rcMod != null)
-                        isMegaregion = rcMod.IsRootForMegaregion(m_scene.RegionInfo.RegionID);
-                    else
-                        isMegaregion = false;
+            xtw.Flush();
+            xtw.Close();
 
-                    if (isMegaregion)
-                        size = rcMod.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID);
-                    else
-                        size = new Vector2((float)Constants.RegionSize, (float)Constants.RegionSize);
-
-                    xtw.WriteElementString("is_megaregion", isMegaregion.ToString());
-                    xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
-
-                    xtw.WriteEndElement();
-        
-                    xtw.WriteElementString("assets_included", SaveAssets.ToString());
-
-                    xtw.WriteEndElement();
-        
-                    xtw.Flush();
-                }
-
-                s = sw.ToString();
-            }
-
-//            if (m_scene != null)
-//                Console.WriteLine(
-//                    "[ARCHIVE WRITE REQUEST PREPARATION]: Control file for {0} is: {1}", m_scene.RegionInfo.RegionName, s);
+            String s = sw.ToString();
+            sw.Close();
 
             return s;
         }

OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs

@@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         private static readonly ILog m_log = 
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public Scene Scene { get; private set; }
-        public IRegionCombinerModule RegionCombinerModule { get; private set; }
+        private Scene m_scene;
 
         /// <value>
         /// The file used to load and save an opensimulator archive if no filename has been specified
@@ -71,14 +70,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void AddRegion(Scene scene)
         {
-            Scene = scene;
-            Scene.RegisterModuleInterface<IRegionArchiverModule>(this);
+            m_scene = scene;
+            m_scene.RegisterModuleInterface<IRegionArchiverModule>(this);
             //m_log.DebugFormat("[ARCHIVER]: Enabled for region {0}", scene.RegionInfo.RegionName);
         }
 
         public void RegionLoaded(Scene scene)
         {
-            RegionCombinerModule = scene.RequestModuleInterface<IRegionCombinerModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -167,9 +165,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void ArchiveRegion(string savePath, Guid requestId, Dictionary<string, object> options)
         {
             m_log.InfoFormat(
-                "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
+                "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath);
             
-            new ArchiveWriteRequestPreparation(this, savePath, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(options);
         }
 
         public void ArchiveRegion(Stream saveStream)
@@ -184,7 +182,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options)
         {
-            new ArchiveWriteRequestPreparation(this, saveStream, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion(options);
         }
 
         public void DearchiveRegion(string loadPath)
@@ -195,9 +193,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId)
         {
             m_log.InfoFormat(
-                "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
+                "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath);
             
-            new ArchiveReadRequest(Scene, loadPath, merge, skipAssets, requestId).DearchiveRegion();
+            new ArchiveReadRequest(m_scene, loadPath, merge, skipAssets, requestId).DearchiveRegion();
         }
         
         public void DearchiveRegion(Stream loadStream)
@@ -207,7 +205,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         
         public void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId)
         {
-            new ArchiveReadRequest(Scene, loadStream, merge, skipAssets, requestId).DearchiveRegion();
+            new ArchiveReadRequest(m_scene, loadStream, merge, skipAssets, requestId).DearchiveRegion();
         }
     }
 }

OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs

@@ -141,15 +141,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 PerformAssetsRequestCallback(null);
                 return;
             }
-
-            m_requestCallbackTimer.Enabled = true;
-
+            
             foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids)
             {
-//                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
-                AssetBase asset = m_assetService.Get(kvp.Key.ToString());
-                PreAssetRequestCallback(kvp.Key.ToString(), kvp.Value, asset);
+                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
             }
+
+            m_requestCallbackTimer.Enabled = true;
         }
 
         protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args)

OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs

@@ -587,8 +587,6 @@ 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));
             
@@ -635,8 +633,6 @@ 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>