Revert "Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself.""

This reverts commit 59a29f5f22.
The original revert was committed by mistake - it turns out this was not the cause of Mantis 6089

Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

.gitignore

@@ -1,6 +1,5 @@
 .project
 .settings
-.gitignore
 *.csproj
 *.csproj.user
 *.build
@@ -11,7 +10,6 @@
 *.pidb
 *.dll.build
 *.dll
-*.log
 *.VisualState.xml
 */*/obj
 */*/*/obj
@@ -25,7 +23,6 @@
 */*/*/*/*/bin
 */*/*/*/*/*/bin
 */*/*/*/*/*/*/bin
-addon-modules/
 bin/Debug/*.dll
 bin/*.dll.mdb
 bin/*.db

CONTRIBUTORS.txt

@@ -1,4 +1,4 @@
-<<<>>>>The following people have contributed to OpenSim (Thank you 
+   <<<>>>>The following people have contributed to OpenSim (Thank you 
 for your effort!)
 
 = Current OpenSim Developers (in very rough order of appearance) =

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -131,7 +131,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_region_query"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRegionQueryMethod);
                     availableMethods["admin_shutdown"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcShutdownMethod);
                     availableMethods["admin_broadcast"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAlertMethod);
-                    availableMethods["admin_dialog"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcDialogMethod);
                     availableMethods["admin_restart"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRestartMethod);
                     availableMethods["admin_load_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcLoadHeightmapMethod);
                     availableMethods["admin_save_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcSaveHeightmapMethod);
@@ -258,101 +257,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 m_log.Info("[RADMIN]: Request to restart Region.");
 
+                CheckRegionParams(requestData, responseData);
+
                 Scene rebootedScene = null;
-                bool restartAll = false;
-
-                IConfig startupConfig = m_configSource.Configs["Startup"];
-                if (startupConfig != null)
-                {
-                    if (startupConfig.GetBoolean("InworldRestartShutsDown", false))
-                    {
-                        rebootedScene = m_application.SceneManager.CurrentOrFirstScene;
-                        restartAll = true;
-                    }
-                }
-
-                if (rebootedScene == null)
-                {
-                    CheckRegionParams(requestData, responseData);
-
-                    GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
-                }
-
-                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
+                GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
 
                 responseData["success"] = false;
                 responseData["accepted"] = true;
                 responseData["rebooting"] = true;
 
-                string message;
-                List<int> times = new List<int>();
-
-                if (requestData.ContainsKey("alerts"))
+                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
+                if (restartModule != null)
                 {
-                    string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
-                    if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
-                    {
-                        if (restartModule != null)
-                        {
-                            message = "Restart has been cancelled";
+                    List<int> times = new List<int> { 30, 15 };
 
-                            if (requestData.ContainsKey("message"))
-                                message = requestData["message"].ToString();
-
-                            restartModule.AbortRestart(message);
-
-                            responseData["success"] = true;
-                            responseData["rebooting"] = false;
-
-                            return;
-                        }
-                    }
-                    foreach (string a in alertTimes)
-                        times.Add(Convert.ToInt32(a));
+                    restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+                    responseData["success"] = true;
                 }
-                else
-                {
-                    int timeout = 30;
-                    if (requestData.ContainsKey("milliseconds"))
-                        timeout = Int32.Parse(requestData["milliseconds"].ToString()) / 1000;
-                    while (timeout > 0)
-                    {
-                        times.Add(timeout);
-                        if (timeout > 300)
-                            timeout -= 120;
-                        else if (timeout > 30)
-                            timeout -= 30;
-                        else
-                            timeout -= 15;
-                    }
-                }
-
-                message = "Region is restarting in {0}. Please save what you are doing and log out.";
-
-                if (requestData.ContainsKey("message"))
-                    message = requestData["message"].ToString();
-
-                bool notice = true;
-                if (requestData.ContainsKey("noticetype")
-                    && ((string)requestData["noticetype"] == "dialog"))
-                {
-                    notice = false;
-                }
-
-                List<Scene> restartList;
-
-                if (restartAll)
-                    restartList = m_application.SceneManager.Scenes;
-                else
-                    restartList = new List<Scene>() { rebootedScene };
-
-                foreach (Scene s in m_application.SceneManager.Scenes)
-                {
-                    restartModule = s.RequestModuleInterface<IRestartModule>();
-                    if (restartModule != null)
-                        restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
-                }
-                responseData["success"] = true;
             }
             catch (Exception e)
             {
@@ -389,32 +310,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.Info("[RADMIN]: Alert request complete");
         }
 
-        public void XmlRpcDialogMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
-        {
-            Hashtable responseData = (Hashtable)response.Value;
-
-            m_log.Info("[RADMIN]: Dialog request started");
-
-            Hashtable requestData = (Hashtable)request.Params[0];
-
-            string message = (string)requestData["message"];
-            string fromuuid = (string)requestData["from"];
-            m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
-
-            responseData["accepted"] = true;
-            responseData["success"] = true;
-
-            m_application.SceneManager.ForEachScene(
-                delegate(Scene scene)
-                {
-                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                    if (dialogModule != null)
-                        dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
-                });
-
-            m_log.Info("[RADMIN]: Dialog request complete");
-        }
-
         private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: Load height maps request started");
@@ -503,32 +398,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 message = "Region is going down now.";
             }
 
-            if (requestData.ContainsKey("noticetype")
-                && ((string) requestData["noticetype"] == "dialog"))
-            {
-                m_application.SceneManager.ForEachScene(
-
+            m_application.SceneManager.ForEachScene(
                 delegate(Scene scene)
-                {
-                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                    if (dialogModule != null)
-                            dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
-                });
-            }
-            else
-            {
-                if (!requestData.ContainsKey("noticetype")
-                    || ((string)requestData["noticetype"] != "none"))
-                {
-                    m_application.SceneManager.ForEachScene(
-                    delegate(Scene scene)
                     {
                         IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
                         if (dialogModule != null)
                             dialogModule.SendGeneralAlert(message);
                     });
-                }
-            }
 
             // Perform shutdown
             System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
@@ -1694,31 +1570,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void XmlRpcRegionQueryMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
+            m_log.Info("[RADMIN]: Received Query XML Administrator Request");
+
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            int flags = 0;
-            string text = String.Empty;
-            int health = 0;
-            responseData["success"] = true;
-
             CheckRegionParams(requestData, responseData);
 
             Scene scene = null;
-            try
-            {
-                GetSceneFromRegionParams(requestData, responseData, out scene);
-                health = scene.GetHealth(out flags, out text);
-            }
-            catch (Exception e)
-            {
-                responseData["error"] = null;
-            }
+            GetSceneFromRegionParams(requestData, responseData, out scene);
+
+            int health = scene.GetHealth();
+            responseData["health"] = health;
 
             responseData["success"] = true;
-            responseData["health"] = health;
-            responseData["flags"] = flags;
-            responseData["message"] = text;
+            m_log.Info("[RADMIN]: Query XML Administrator Request complete");
         }
 
         private void XmlRpcConsoleCommandMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)

OpenSim/Capabilities/LLSDStreamHandler.cs

@@ -66,9 +66,7 @@ namespace OpenSim.Framework.Capabilities
 
             TResponse response = m_method(llsdRequest);
 
-            Encoding encoding = new UTF8Encoding(false);
-
-            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+            return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
         }
     }
 }

OpenSim/ConsoleClient/Requester.cs

@@ -50,7 +50,7 @@ namespace OpenSim.ConsoleClient
 
             request.ContentType = "application/x-www-form-urlencoded";
 
-            byte[] buffer = new System.Text.ASCIIEncoding().GetBytes(data);
+            byte[] buffer = Encoding.ASCII.GetBytes(data);
             int length = (int) buffer.Length;
             request.ContentLength = length;
 

OpenSim/Data/AssetDataBase.cs

@@ -38,7 +38,7 @@ namespace OpenSim.Data
     {
         public abstract AssetBase GetAsset(UUID uuid);
         
-        public abstract bool StoreAsset(AssetBase asset);
+        public abstract void StoreAsset(AssetBase asset);
         public abstract bool ExistsAsset(UUID uuid);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);

OpenSim/Data/IAssetData.cs

@@ -34,7 +34,7 @@ namespace OpenSim.Data
     public interface IAssetDataPlugin : IPlugin
     {
         AssetBase GetAsset(UUID uuid);
-        bool StoreAsset(AssetBase asset);
+        void StoreAsset(AssetBase asset);
         bool ExistsAsset(UUID uuid);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);

OpenSim/Data/IUserAccountData.cs

@@ -50,6 +50,5 @@ namespace OpenSim.Data
         bool Store(UserAccountData data);
         bool Delete(string field, string val);
         UserAccountData[] GetUsers(UUID scopeID, string query);
-        UserAccountData[] GetUsersWhere(UUID scopeID, string where);
     }
 }

OpenSim/Data/MSSQL/MSSQLAssetData.cs

@@ -143,7 +143,7 @@ namespace OpenSim.Data.MSSQL
         /// Create asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
            
             string sql =
@@ -192,12 +192,10 @@ namespace OpenSim.Data.MSSQL
                 try
                 {
                     command.ExecuteNonQuery();
-                    return true;
                 }
                 catch(Exception e)
                 {
                     m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
-                    return false;
                 }
             }
         }

OpenSim/Data/MSSQL/MSSQLAvatarData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>,
             IAvatarData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")

OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs

@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLGenericTableHandler<T> where T : class, new()
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_ConnectionString;
         protected MSSQLManager m_database; //used for parameter type translation

OpenSim/Data/MSSQL/MSSQLGridUserData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>,
             IGridUserData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "GridUserStore")

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -41,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLManager
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Connection string for ADO.net
@@ -185,8 +185,6 @@ namespace OpenSim.Data.MSSQL
             return parameter;
         }
 
-        private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>();
-
         /// <summary>
         /// Checks if we need to do some migrations to the database
         /// </summary>

OpenSim/Data/MSSQL/MSSQLPresenceData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
             IPresenceData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLPresenceData(string connectionString, string realm) :
                 base(connectionString, realm, "Presence")

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -2202,10 +2202,5 @@ VALUES
                 }
             }
         }
-
-        public UUID[] GetObjectIDs(UUID regionID)
-        {
-            return new UUID[0];
-        }
     }
 }

OpenSim/Data/MSSQL/MSSQLUserAccountData.cs

@@ -242,10 +242,5 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/MSSQL/MSSQLXInventoryData.cs

@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLXInventoryData : IXInventoryData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         private MSSQLGenericTableHandler<XInventoryFolder> m_Folders;
         private MSSQLItemHandler m_Items;

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -155,7 +155,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -201,14 +201,12 @@ namespace OpenSim.Data.MySQL
                                 cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
                                 cmd.Parameters.AddWithValue("?data", asset.Data);
                                 cmd.ExecuteNonQuery();
-                                return true;
                             }
                         }
                         catch (Exception e)
                         {
                             m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
                                 asset.FullID, asset.Name, e.Message);
-                            return false;
                         }
                     }
                 }
@@ -372,4 +370,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
+}

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -175,11 +175,6 @@ namespace OpenSim.Data.MySQL
                                 int v = Convert.ToInt32(reader[name]);
                                 m_Fields[name].SetValue(row, v);
                             }
-                            else if (m_Fields[name].FieldType == typeof(uint))
-                            {
-                                uint v = Convert.ToUInt32(reader[name]);
-                                m_Fields[name].SetValue(row, v);
-                            }
                             else
                             {
                                 m_Fields[name].SetValue(row, reader[name]);
@@ -301,4 +296,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -66,7 +66,7 @@ namespace OpenSim.Data.MySQL
             Initialise(connectionString);
         }
 
-        public virtual void Initialise(string connectionString)
+        public void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
 
@@ -113,16 +113,14 @@ namespace OpenSim.Data.MySQL
 
         public void Dispose() {}
 
-        public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             uint flags = obj.RootPart.GetEffectiveObjectFlags();
 
             // Eligibility check
             //
-            // PrimFlags.Temporary is not used in OpenSim code and cannot
-            // be guaranteed to always be clear. Don't check it.
-//            if ((flags & (uint)PrimFlags.Temporary) != 0)
-//                return;
+            if ((flags & (uint)PrimFlags.Temporary) != 0)
+                return;
             if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
                 return;
 
@@ -137,7 +135,7 @@ namespace OpenSim.Data.MySQL
                         foreach (SceneObjectPart prim in obj.Parts)
                         {
                             cmd.Parameters.Clear();
-
+    
                             cmd.CommandText = "replace into prims (" +
                                     "UUID, CreationDate, " +
                                     "Name, Text, Description, " +
@@ -173,10 +171,7 @@ namespace OpenSim.Data.MySQL
                                     "ParticleSystem, ClickAction, Material, " +
                                     "CollisionSound, CollisionSoundVolume, " +
                                     "PassTouches, " +
-                                    "PassCollisions, " +
-                                    "LinkNumber, MediaURL, KeyframeMotion, " +
-                                    "PhysicsShapeType, Density, GravityModifier, " +
-                                    "Friction, Restitution) values (" + "?UUID, " +
+                                    "LinkNumber, MediaURL) values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
                                     "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
@@ -207,17 +202,14 @@ namespace OpenSim.Data.MySQL
                                     "?SaleType, ?ColorR, ?ColorG, " +
                                     "?ColorB, ?ColorA, ?ParticleSystem, " +
                                     "?ClickAction, ?Material, ?CollisionSound, " +
-                                    "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
-                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
-                                    "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                    "?Friction, ?Restitution)";
-
+                                    "?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, " +
@@ -239,9 +231,9 @@ namespace OpenSim.Data.MySQL
                                     "?ProfileEnd, ?ProfileCurve, " +
                                     "?ProfileHollow, ?Texture, ?ExtraParams, " +
                                     "?State, ?Media)";
-
+    
                             FillShapeCommand(cmd, prim);
-
+    
                             ExecuteNonQuery(cmd);
                         }
                     }
@@ -249,7 +241,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void RemoveObject(UUID obj, UUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
             
@@ -398,7 +390,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
             const int ROWS_PER_QUERY = 5000;
 
@@ -454,11 +446,7 @@ namespace OpenSim.Data.MySQL
             foreach (SceneObjectPart prim in prims.Values)
             {
                 if (prim.ParentUUID == UUID.Zero)
-                {
                     objects[prim.UUID] = new SceneObjectGroup(prim);
-                    if (prim.KeyframeMotion != null)
-                        prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]);
-                }
             }
 
             // Add all of the children objects to the SOGs
@@ -571,51 +559,36 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void StoreTerrain(double[,] ter, UUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            Util.FireAndForget(delegate(object x)
+            m_log.Info("[REGION DB]: Storing terrain");
+
+            lock (m_dbLock)
             {
-                double[,] oldTerrain = LoadTerrain(regionID);
-
-                m_log.Info("[REGION DB]: Storing terrain");
-
-                lock (m_dbLock)
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
-                        dbcon.Open();
+                        cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                        using (MySqlCommand cmd = dbcon.CreateCommand())
-                        {
-                            cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
-                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        ExecuteNonQuery(cmd);
 
-                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
-                            {
-                                try
-                                {
-                                    cmd2.CommandText = "insert into terrain (RegionUUID, " +
-                                            "Revision, Heightfield) values (?RegionUUID, " +
-                                            "1, ?Heightfield)";
+                        cmd.CommandText = "insert into terrain (RegionUUID, " +
+                            "Revision, Heightfield) values (?RegionUUID, " +
+                            "1, ?Heightfield)";
 
-                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
-                                    cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter, oldTerrain));
+                        cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
 
-                                    ExecuteNonQuery(cmd);
-                                    ExecuteNonQuery(cmd2);
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.ErrorFormat(e.ToString());
-                                }
-                            }
-                        }
+                        ExecuteNonQuery(cmd);
                     }
                 }
-            });
+            }
         }
 
-        public virtual double[,] LoadTerrain(UUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             double[,] terrain = null;
 
@@ -665,7 +638,7 @@ namespace OpenSim.Data.MySQL
             return terrain;
         }
 
-        public virtual void RemoveLandObject(UUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
             lock (m_dbLock)
             {
@@ -684,7 +657,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void StoreLandObject(ILandObject parcel)
+        public void StoreLandObject(ILandObject parcel)
         {
             lock (m_dbLock)
             {
@@ -741,7 +714,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
@@ -763,7 +736,7 @@ namespace OpenSim.Data.MySQL
                     {
                         //No result, so store our default windlight profile and return it
                         nWP.regionID = regionUUID;
-                        // StoreRegionWindlightSettings(nWP);
+                        StoreRegionWindlightSettings(nWP);
                         return nWP;
                     }
                     else
@@ -838,7 +811,7 @@ namespace OpenSim.Data.MySQL
             return nWP;
         }
 
-        public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
 
@@ -878,7 +851,7 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -981,7 +954,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void RemoveRegionWindlightSettings(UUID regionID)
+        public void RemoveRegionWindlightSettings(UUID regionID)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1058,7 +1031,7 @@ namespace OpenSim.Data.MySQL
         }
         #endregion
 
-        public virtual void StoreRegionSettings(RegionSettings rs)
+        public void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
             {
@@ -1085,7 +1058,7 @@ namespace OpenSim.Data.MySQL
                             "use_estate_sun, fixed_sun, sun_position, " +
                             "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, block_search, casino, " +
+                            "loaded_creation_id, map_tile_ID, " +
                             "TelehubObject, parcel_tile_ID) " +
                              "values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
@@ -1102,8 +1075,7 @@ namespace OpenSim.Data.MySQL
                             "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubObject, ?ParcelImageID)";
+                            "?TerrainImageID, ?TelehubObject, ?ParcelImageID) ";
 
                         FillRegionSettingsCommand(cmd, rs);
 
@@ -1114,7 +1086,7 @@ namespace OpenSim.Data.MySQL
             SaveSpawnPoints(rs);
         }
 
-        public virtual List<LandData> LoadLandObjects(UUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landData = new List<LandData>();
 
@@ -1296,31 +1268,11 @@ namespace OpenSim.Data.MySQL
             prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
             
             prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
-            prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
             
             if (!(row["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)row["MediaURL"];
 
-            if (!(row["KeyframeMotion"] is DBNull))
-            {
-                Byte[] data = (byte[])row["KeyframeMotion"];
-                if (data.Length > 0)
-                    prim.KeyframeMotion = KeyframeMotion.FromData(null, data);
-                else
-                    prim.KeyframeMotion = null;
-            }
-            else
-            {
-                prim.KeyframeMotion = null;
-            }
-
-            prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString());
-            prim.Density = (float)(double)row["Density"];
-            prim.GravityModifier = (float)(double)row["GravityModifier"];
-            prim.Friction = (float)(double)row["Friction"];
-            prim.Bounciness = (float)(double)row["Restitution"];
-
             return prim;
         }
 
@@ -1331,40 +1283,32 @@ namespace OpenSim.Data.MySQL
         /// <returns></returns>
         private static TaskInventoryItem BuildItem(IDataReader row)
         {
-            try
-            {
-                TaskInventoryItem taskItem = new TaskInventoryItem();
+            TaskInventoryItem taskItem = new TaskInventoryItem();
 
-                taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
-                taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
-                taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
-                taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
+            taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
+            taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
+            taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
+            taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
 
-                taskItem.InvType       = Convert.ToInt32(row["invType"]);
-                taskItem.Type          = Convert.ToInt32(row["assetType"]);
+            taskItem.InvType       = Convert.ToInt32(row["invType"]);
+            taskItem.Type          = Convert.ToInt32(row["assetType"]);
 
-                taskItem.Name          = (String)row["name"];
-                taskItem.Description   = (String)row["description"];
-                taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-                taskItem.CreatorIdentification = (String)row["creatorID"];
-                taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
-                taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
-                taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
+            taskItem.Name          = (String)row["name"];
+            taskItem.Description   = (String)row["description"];
+            taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
+            taskItem.CreatorIdentification = (String)row["creatorID"];
+            taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
+            taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
+            taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
 
-                taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
-                taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
-                taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
-                taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
-                taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
-                taskItem.Flags         = Convert.ToUInt32(row["flags"]);
+            taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
+            taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
+            taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
+            taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
+            taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
+            taskItem.Flags         = Convert.ToUInt32(row["flags"]);
 
-                return taskItem;
-            }
-            catch
-            {
-                m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString());
-                throw;
-            }
+            return taskItem;
         }
 
         private static RegionSettings BuildRegionSettings(IDataReader row)
@@ -1422,9 +1366,6 @@ namespace OpenSim.Data.MySQL
             newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
             newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
 
-            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
-            newSettings.Casino = Convert.ToBoolean(row["casino"]);
-
             return newSettings;
         }
 
@@ -1522,7 +1463,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="val"></param>
         /// <returns></returns>
-        private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
+        private static Array SerializeTerrain(double[,] val)
         {
             MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
             BinaryWriter bw = new BinaryWriter(str);
@@ -1531,11 +1472,7 @@ namespace OpenSim.Data.MySQL
             for (int x = 0; x < (int)Constants.RegionSize; x++)
                 for (int y = 0; y < (int)Constants.RegionSize; y++)
                 {
-                    double height = 20.0;
-                    if (oldTerrain != null)
-                        height = oldTerrain[x, y];
-                    if (!double.IsNaN(val[x, y]))
-                        height = val[x, y];
+                    double height = val[x, y];
                     if (height == 0.0)
                         height = double.Epsilon;
 
@@ -1679,24 +1616,8 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("PassTouches", 0);
 
-            if (prim.PassCollisions)
-                cmd.Parameters.AddWithValue("PassCollisions", 1);
-            else
-                cmd.Parameters.AddWithValue("PassCollisions", 0);
-
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
-
-            if (prim.KeyframeMotion != null)
-                cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize());
-            else
-                cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]);
-
-            cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType);
-            cmd.Parameters.AddWithValue("Density", (double)prim.Density);
-            cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier);
-            cmd.Parameters.AddWithValue("Friction", (double)prim.Friction);
-            cmd.Parameters.AddWithValue("Restitution", (double)prim.Bounciness);
         }
 
         /// <summary>
@@ -1775,9 +1696,6 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
-            cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
-            cmd.Parameters.AddWithValue("casino", settings.Casino);
-
             cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
         }
@@ -1938,7 +1856,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
-        public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             lock (m_dbLock)
             {
@@ -1982,37 +1900,6 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public UUID[] GetObjectIDs(UUID regionID)
-        {
-            List<UUID> uuids = new List<UUID>();
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID";
-                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
-
-                        using (IDataReader reader = ExecuteReader(cmd))
-                        {
-                            while (reader.Read())
-                            {
-                                UUID id = new UUID(reader["UUID"].ToString());
-
-                                uuids.Add(id);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return uuids.ToArray();
-        }
-
         private void LoadSpawnPoints(RegionSettings rs)
         {
             rs.ClearSpawnPoints();

OpenSim/Data/MySQL/MySQLUserAccountData.cs

@@ -46,21 +46,17 @@ namespace OpenSim.Data.MySQL
         {
             string[] words = query.Split(new char[] {' '});
 
-            bool valid = false;
-
             for (int i = 0 ; i < words.Length ; i++)
             {
-                if (words[i].Length > 2)
-                    valid = true;
-//                if (words[i].Length < 3)
-//                {
-//                    if (i != words.Length - 1)
-//                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-//                    Array.Resize(ref words, words.Length - 1);
-//                }
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
             }
 
-            if ((!valid) || words.Length == 0)
+            if (words.Length == 0)
                 return new UserAccountData[0];
 
             if (words.Length > 2)
@@ -70,36 +66,20 @@ namespace OpenSim.Data.MySQL
             {
                 if (words.Length == 1)
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
-                    cmd.Parameters.AddWithValue("?search", words[0] + "%");
+                    cmd.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 and LastName like ?searchLast) and active=1", m_Realm);
-                    cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
-                    cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
+                    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);
             }
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                if (scopeID != UUID.Zero)
-                {
-                    where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
-
-                cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
-
-                return DoQuery(cmd);
-            }
-        }
     }
-}
+}

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -497,4 +497,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
+}

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32			#---------------------
+:VERSION 32
 
 BEGIN;
 CREATE TABLE `regionwindlight` (

OpenSim/Data/Null/NullSimulationData.cs

@@ -151,10 +151,5 @@ namespace OpenSim.Data.Null
         public void Shutdown()
         {
         }
-
-        public UUID[] GetObjectIDs(UUID regionID)
-        {
-            return new UUID[0];
-        }
     }
 }

OpenSim/Data/Null/NullUserAccountData.cs

@@ -193,10 +193,5 @@ namespace OpenSim.Data.Null
 
             return false;
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -131,7 +131,7 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
@@ -153,7 +153,6 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
-                        return true;
                     }
                 }
             }
@@ -174,7 +173,6 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
-                        return true;
                     }
                 }
             }

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -2890,9 +2890,5 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        public UUID[] GetObjectIDs(UUID regionID)
-        {
-            return new UUID[0];
-        }
     }
 }

OpenSim/Data/SQLite/SQLiteUserAccountData.cs

@@ -81,10 +81,5 @@ namespace OpenSim.Data.SQLite
 
             return DoQuery(cmd);
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/Tests/RegionTests.cs

@@ -1069,8 +1069,6 @@ namespace OpenSim.Data.Tests
             regionInfo.RegionLocX = 0;
             regionInfo.RegionLocY = 0;
 
-            Scene scene = new Scene(regionInfo);
-
             SceneObjectPart sop = new SceneObjectPart();
             sop.Name = name;
             sop.Description = name;
@@ -1081,7 +1079,7 @@ namespace OpenSim.Data.Tests
             sop.Shape = PrimitiveBaseShape.Default;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            sog.SetScene(scene);
+//            sog.SetScene(scene);
 
             return sog;
         }

OpenSim/Framework/AgentCircuitData.cs

@@ -98,6 +98,11 @@ namespace OpenSim.Framework
         /// </summary>
         public string lastname;
 
+        /// <summary>
+        /// Agent's full name.
+        /// </summary>
+        public string Name { get { return string.Format("{0} {1}", firstname, lastname); } }
+
         /// <summary>
         /// Random Unique GUID for this session.  Client gets this at login and it's
         /// only supposed to be disclosed over secure channels

OpenSim/Framework/AssetBase.cs

@@ -60,8 +60,6 @@ namespace OpenSim.Framework
         /// </summary>
         private AssetMetadata m_metadata;
 
-        private int m_uploadAttempts;
-
         // This is needed for .NET serialization!!!
         // Do NOT "Optimize" away!
         public AssetBase()
@@ -200,12 +198,6 @@ namespace OpenSim.Framework
             set { m_metadata.Type = value; }
         }
 
-        public int UploadAttempts
-        {
-            get { return m_uploadAttempts; }
-            set { m_uploadAttempts = value; }
-        }
-
         /// <summary>
         /// Is this a region only asset, or does this exist on the asset server also
         /// </summary>

OpenSim/Framework/AvatarAppearance.cs

@@ -42,8 +42,6 @@ namespace OpenSim.Framework
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        // this is viewer capabilities and weared things dependent
-        // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
         public readonly static int TEXTURE_COUNT = 21;
@@ -242,21 +240,6 @@ namespace OpenSim.Framework
 //            }
         }
 
-        /// <summary>
-        /// Invalidate all of the baked textures in the appearance, useful
-        /// if you know that none are valid
-        /// </summary>
-        public virtual void ResetBakedTextures()
-        {
-            SetDefaultTexture();
-            
-            //for (int i = 0; i < BAKE_INDICES.Length; i++)
-            // {
-            //     int idx = BAKE_INDICES[i];
-            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
-            // }
-        }
-        
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -321,30 +304,19 @@ namespace OpenSim.Framework
             // made. We determine if any of the visual parameters actually
             // changed to know if the appearance should be saved later
             bool changed = false;
-
-            int newsize = visualParams.Length;
-
-            if (newsize != m_visualparams.Length)
+            for (int i = 0; i < AvatarAppearance.VISUALPARAM_COUNT; i++)
             {
-                changed = true;
-                m_visualparams = (byte[])visualParams.Clone();
-            }
-            else
-            {
-
-                for (int i = 0; i < newsize; i++)
+                if (visualParams[i] != m_visualparams[i])
                 {
-                    if (visualParams[i] != m_visualparams[i])
-                    {
-                        // DEBUG ON
-                        //                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
-                        //                                     i,m_visualparams[i],visualParams[i]);
-                        // DEBUG OFF
-                        m_visualparams[i] = visualParams[i];
-                        changed = true;
-                    }
+// DEBUG ON
+//                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
+//                                     i,m_visualparams[i],visualParams[i]);
+// DEBUG OFF
+                    m_visualparams[i] = visualParams[i];
+                    changed = true;
                 }
             }
+
             // Reset the height if the visual parameters actually changed
             if (changed)
                 SetHeight();
@@ -402,8 +374,7 @@ namespace OpenSim.Framework
             }
 
             s += "Visual Params: ";
-            //            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
-            for (uint j = 0; j < m_visualparams.Length; j++)
+            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
                 s += String.Format("{0},",m_visualparams[j]);
             s += "\n";
 
@@ -419,18 +390,19 @@ namespace OpenSim.Framework
         /// </remarks>
         public List<AvatarAttachment> GetAttachments()
         {
-            
+            List<AvatarAttachment> alist = new List<AvatarAttachment>();
 
             lock (m_attachments)
             {
-				List<AvatarAttachment> alist = new List<AvatarAttachment>();
                 foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                 {
                     foreach (AvatarAttachment attach in kvp.Value)
                         alist.Add(new AvatarAttachment(attach));
                 }
-				return alist;
-			}        }
+            }
+
+            return alist;
+        }
 
         internal void AppendAttachment(AvatarAttachment attach)
         {
@@ -559,6 +531,7 @@ namespace OpenSim.Framework
                         return kvp.Key;
                 }
             }
+
             return 0;
         }
 
@@ -625,14 +598,12 @@ namespace OpenSim.Framework
             OSDBinary visualparams = new OSDBinary(m_visualparams);
             data["visualparams"] = visualparams;
 
-            lock (m_attachments)
-            {
-                // Attachments
-                OSDArray attachs = new OSDArray(m_attachments.Count);
-                foreach (AvatarAttachment attach in GetAttachments())
-                    attachs.Add(attach.Pack());
-                data["attachments"] = attachs;
-            }
+            // Attachments
+            List<AvatarAttachment> attachments = GetAttachments();
+            OSDArray attachs = new OSDArray(attachments.Count);
+            foreach (AvatarAttachment attach in GetAttachments())
+                attachs.Add(attach.Pack());
+            data["attachments"] = attachs;
 
             return data;
         }

OpenSim/Framework/AvatarWearable.cs

@@ -62,14 +62,9 @@ namespace OpenSim.Framework
         public static readonly int UNDERSHIRT = 10;
         public static readonly int UNDERPANTS = 11;
         public static readonly int SKIRT = 12;
-
-        public static readonly int MAX_BASICWEARABLES = 13;
-
         public static readonly int ALPHA = 13;
         public static readonly int TATTOO = 14;
-//        public static readonly int PHYSICS = 15;
 
-        //        public static readonly int MAX_WEARABLES = 16;
         public static readonly int MAX_WEARABLES = 15;
 
         public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
@@ -224,7 +219,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES];
+                AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES]; //should be 15 of these
                 for (int i = 0; i < MAX_WEARABLES; i++)
                 {
                     defaultWearables[i] = new AvatarWearable();
@@ -247,13 +242,10 @@ namespace OpenSim.Framework
                 
 //                // Alpha
 //                defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);
-
-                //                // Tattoo
-                //                defaultWearables[TATTOO].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
-
-                //                // Physics
-                //                defaultWearables[PHYSICS].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
-
+                
+//                // Tattoo
+//                defaultWearables[TATTOO].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
+                
                 return defaultWearables;
             }
         }

OpenSim/Framework/ChildAgentDataUpdate.cs

@@ -229,14 +229,12 @@ namespace OpenSim.Framework
 
     public class ControllerData
     {
-        public UUID ObjectID;
         public UUID ItemID;
         public uint IgnoreControls;
         public uint EventControls;
 
-        public ControllerData(UUID obj, UUID item, uint ignore, uint ev)
+        public ControllerData(UUID item, uint ignore, uint ev)
         {
-            ObjectID = obj;
             ItemID = item;
             IgnoreControls = ignore;
             EventControls = ev;
@@ -250,7 +248,6 @@ namespace OpenSim.Framework
         public OSDMap PackUpdateMessage()
         {
             OSDMap controldata = new OSDMap();
-            controldata["object"] = OSD.FromUUID(ObjectID);
             controldata["item"] = OSD.FromUUID(ItemID);
             controldata["ignore"] = OSD.FromInteger(IgnoreControls);
             controldata["event"] = OSD.FromInteger(EventControls);
@@ -261,8 +258,6 @@ namespace OpenSim.Framework
 
         public void UnpackUpdateMessage(OSDMap args)
         {
-            if (args["object"] != null)
-                ObjectID = args["object"].AsUUID();
             if (args["item"] != null)
                 ItemID = args["item"].AsUUID();
             if (args["ignore"] != null)
@@ -311,11 +306,8 @@ namespace OpenSim.Framework
 
         public AgentGroupData[] Groups;
         public Animation[] Anims;
-        public Animation DefaultAnim = null;
 
         public UUID GranterID;
-        public UUID ParentPart;
-        public Vector3 SitOffset;
 
         // Appearance
         public AvatarAppearance Appearance;
@@ -398,11 +390,6 @@ namespace OpenSim.Framework
                 args["animations"] = anims;
             }
 
-            if (DefaultAnim != null)
-            {
-                args["default_animation"] = DefaultAnim.PackUpdateMessage();
-            }
-
             if (Appearance != null)
                 args["packed_appearance"] = Appearance.Pack();
 
@@ -481,10 +468,6 @@ namespace OpenSim.Framework
                 }
                 args["attach_objects"] = attObjs;
             }
-
-            args["parent_part"] = OSD.FromUUID(ParentPart);
-            args["sit_offset"] = OSD.FromString(SitOffset.ToString());
-
             return args;
         }
 
@@ -600,18 +583,6 @@ namespace OpenSim.Framework
                 }
             }
 
-            if (args["default_animation"] != null)
-            {
-                try
-                {
-                    DefaultAnim = new Animation((OSDMap)args["default_animation"]);
-                }
-                catch
-                {
-                    DefaultAnim = null;
-                }
-            }
-
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
             //{
             //    OSDArray textures = (OSDArray)(args["agent_textures"]);
@@ -704,11 +675,6 @@ namespace OpenSim.Framework
                     }
                 }
             }
-
-            if (args["parent_part"] != null)
-                ParentPart = args["parent_part"].AsUUID();
-            if (args["sit_offset"] != null)
-                Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset);
         }
 
         public AgentData()

OpenSim/Framework/Communications/RestClient.cs

@@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications
             _request = (HttpWebRequest) WebRequest.Create(buildUri());
             _request.KeepAlive = false;
             _request.ContentType = "application/xml";
-            _request.Timeout = 30000;
+            _request.Timeout = 900000;
             _request.Method = RequestMethod;
             _asyncException = null;
             _request.ContentLength = src.Length;

OpenSim/Framework/EstateSettings.cs

@@ -58,30 +58,6 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
-        private bool m_AllowLandmark = true;
-
-        public bool AllowLandmark
-        {
-            get { return m_AllowLandmark; }
-            set { m_AllowLandmark = value; }
-        }
-
-        private bool m_AllowParcelChanges = true;
-
-        public bool AllowParcelChanges
-        {
-            get { return m_AllowParcelChanges; }
-            set { m_AllowParcelChanges = value; }
-        }
-
-        private bool m_AllowSetHome = true;
-
-        public bool AllowSetHome
-        {
-            get { return m_AllowSetHome; }
-            set { m_AllowSetHome = value; }
-        }
-
         private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
@@ -362,30 +338,11 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public bool IsBanned(UUID avatarID, int userFlags)
+        public bool IsBanned(UUID avatarID)
         {
             foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
-
-            if (!IsEstateManagerOrOwner(avatarID) && !HasAccess(avatarID))
-            {
-                if (DenyMinors)
-                {
-                    if ((userFlags & 32) == 0)
-                    {
-                        return true;
-                    }
-                }
-                if (DenyAnonymous)
-                {
-                    if ((userFlags & 4) == 0)
-                    {
-                        return true;
-                    }
-                }
-            }
-
             return false;
         }
 
@@ -393,7 +350,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID, 32)) //Ignore age-based bans
+            if (!IsBanned(ban.BannedUserID))
                 l_EstateBans.Add(ban);
         }
 
@@ -417,15 +374,6 @@ namespace OpenSim.Framework
             return l_EstateAccess.Contains(user);
         }
 
-        public void SetFromFlags(ulong regionFlags)
-        {
-            ResetHomeOnTeleport = ((regionFlags & (ulong)RegionFlags.ResetHomeOnTeleport) == (ulong)RegionFlags.ResetHomeOnTeleport);
-            BlockDwell = ((regionFlags & (ulong)RegionFlags.BlockDwell) == (ulong)RegionFlags.BlockDwell);
-            AllowLandmark = ((regionFlags & (ulong)RegionFlags.AllowLandmark) == (ulong)RegionFlags.AllowLandmark);
-            AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges);
-            AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome);
-        }
-
         public bool GroupAccess(UUID groupID)
         {
             return l_EstateGroups.Contains(groupID);

OpenSim/Framework/ExtraPhysicsData.cs

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public enum PhysShapeType : byte
-    {
-        prim = 0,
-        none = 1,
-        convex = 2,
-
-        invalid = 255 // use to mark invalid data in ExtraPhysicsData
-    }
-
-    public struct ExtraPhysicsData
-    {
-        public float Density;
-        public float GravitationModifier;
-        public float Friction;
-        public float Bounce;
-        public PhysShapeType PhysShapeType;
-
-    }
-}

OpenSim/Framework/IClientAPI.cs

@@ -70,8 +70,6 @@ namespace OpenSim.Framework
 
     public delegate void StopAnim(IClientAPI remoteClient, UUID animID);
 
-    public delegate void ChangeAnim(UUID animID, bool addOrRemove, bool sendPack);
-
     public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children);
 
     public delegate void DelinkObjects(List<uint> primIds, IClientAPI client);
@@ -126,14 +124,12 @@ namespace OpenSim.Framework
     public delegate void ObjectDrop(uint localID, IClientAPI remoteClient);
 
     public delegate void UpdatePrimFlags(
-        uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom,ExtraPhysicsData PhysData, IClientAPI remoteClient);
+        uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient);
 
     public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
 
     public delegate void UpdateVector(uint localID, Vector3 pos, IClientAPI remoteClient);
 
-    public delegate void ClientChangeObject(uint localID, object data ,IClientAPI remoteClient);
-
     public delegate void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
 
     public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
@@ -270,9 +266,6 @@ namespace OpenSim.Framework
     public delegate void MoveInventoryItem(
         IClientAPI remoteClient, List<InventoryItemBase> items);
 
-    public delegate void MoveItemsAndLeaveCopy(
-        IClientAPI remoteClient, List<InventoryItemBase> items, UUID destFolder);
-
     public delegate void RemoveInventoryItem(
         IClientAPI remoteClient, List<UUID> itemIDs);
 
@@ -448,7 +441,6 @@ namespace OpenSim.Framework
     public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client);
     public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
     public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
-    public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client);
 
     public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
     public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
@@ -471,9 +463,9 @@ namespace OpenSim.Framework
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
     
-    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
+    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID);
     
-    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
+    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID);
     
     public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
     
@@ -511,7 +503,6 @@ namespace OpenSim.Framework
     public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
     
     public delegate void SendPostcard(IClientAPI client);
-    public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags);
 
     #endregion
 
@@ -800,7 +791,6 @@ namespace OpenSim.Framework
         event ObjectDrop OnObjectDrop;
         event StartAnim OnStartAnim;
         event StopAnim OnStopAnim;
-        event ChangeAnim OnChangeAnim;
         event LinkObjects OnLinkObjects;
         event DelinkObjects OnDelinkObjects;
         event RequestMapBlocks OnRequestMapBlocks;
@@ -850,7 +840,6 @@ namespace OpenSim.Framework
         event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
         event UpdatePrimFlags OnUpdatePrimFlags;
         event UpdatePrimTexture OnUpdatePrimTexture;
-        event ClientChangeObject onClientChangeObject;
         event UpdateVector OnUpdatePrimGroupPosition;
         event UpdateVector OnUpdatePrimSinglePosition;
         event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -875,7 +864,6 @@ namespace OpenSim.Framework
         event RequestTaskInventory OnRequestTaskInventory;
         event UpdateInventoryItem OnUpdateInventoryItem;
         event CopyInventoryItem OnCopyInventoryItem;
-        event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         event MoveInventoryItem OnMoveInventoryItem;
         event RemoveInventoryFolder OnRemoveInventoryFolder;
         event RemoveInventoryItem OnRemoveInventoryItem;
@@ -994,7 +982,7 @@ namespace OpenSim.Framework
         event ClassifiedInfoRequest OnClassifiedInfoRequest;
         event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         event ClassifiedDelete OnClassifiedDelete;
-        event ClassifiedGodDelete OnClassifiedGodDelete;
+        event ClassifiedDelete OnClassifiedGodDelete;
 
         event EventNotificationAddRequest OnEventNotificationAddRequest;
         event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -1033,7 +1021,6 @@ namespace OpenSim.Framework
         event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         event SimWideDeletesDelegate OnSimWideDeletes;
         event SendPostcard OnSendPostcard;
-        event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         event MuteListEntryUpdate OnUpdateMuteListEntry;
         event MuteListEntryRemove OnRemoveMuteListEntry;
         event GodlikeMessage onGodlikeMessage;
@@ -1047,7 +1034,6 @@ namespace OpenSim.Framework
         void InPacket(object NewPack);
         void ProcessInPacket(Packet NewPack);
         void Close();
-        void Close(bool sendStop);
         void Kick(string message);
         
         /// <summary>
@@ -1329,8 +1315,6 @@ namespace OpenSim.Framework
 
         void SendObjectPropertiesReply(ISceneEntity Entity);
 
-        void SendPartPhysicsProprieties(ISceneEntity Entity);
-
         void SendAgentOffline(UUID[] agentIDs);
 
         void SendAgentOnline(UUID[] agentIDs);
@@ -1369,7 +1353,6 @@ namespace OpenSim.Framework
         void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
 
         void SendLogoutPacket();
-        EndPoint GetClientEP();
 
         // WARNING WARNING WARNING
         //

OpenSim/Framework/IMoneyModule.cs

@@ -40,7 +40,6 @@ namespace OpenSim.Framework
         bool AmountCovered(UUID agentID, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
-        void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
 
         int UploadCharge { get; }
         int GroupCreationCharge { get; }

OpenSim/Framework/LandData.cs

@@ -67,7 +67,7 @@ namespace OpenSim.Framework
 
         private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
                                 (uint) ParcelFlags.AllowAPrimitiveEntry |
-                                (uint) ParcelFlags.AllowDeedToGroup |
+                                (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
                                 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
                                 (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat;
 

OpenSim/Framework/OSChatMessage.cs

@@ -51,11 +51,12 @@ namespace OpenSim.Framework
         protected object m_senderObject;
         protected ChatTypeEnum m_type;
         protected UUID m_fromID;
-        protected UUID m_destination = UUID.Zero;
+        protected UUID m_toID;
 
         public OSChatMessage()
         {
             m_position = new Vector3();
+            m_toID = UUID.Zero;
         }
 
         /// <summary>
@@ -103,6 +104,15 @@ namespace OpenSim.Framework
             set { m_from = value; }
         }
 
+        /// <summary>
+        /// The name of the sender (needed for scripts)
+        /// </summary>
+        public string To
+        {
+            get { return m_from; }
+            set { m_from = value; }
+        }
+
         #region IEventArgs Members
 
         /// TODO: Sender and SenderObject should just be Sender and of
@@ -132,10 +142,13 @@ namespace OpenSim.Framework
             set { m_fromID = value; }
         }
 
-        public UUID Destination
+        /// <summary>
+        /// The single recipient or all if not set.
+        /// </summary>
+        public UUID TargetUUID
         {
-            get { return m_destination; }
-            set { m_destination = value; }
+            get { return m_toID; }
+            set { m_toID = value; }
         }
 
         /// <summary>

OpenSim/Framework/ObjectChangeData.cs

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public enum ObjectChangeType : uint
-    {
-        // bits definitions
-        Position = 0x01,
-        Rotation = 0x02,
-        Scale   = 0x04,
-        Group = 0x08,
-        UniformScale = 0x10,
-
-        // macros from above
-        // single prim
-        primP = 0x01,
-        primR = 0x02,
-        primPR = 0x03,
-        primS = 0x04,
-        primPS = 0x05,
-        primRS = 0x06,
-        primPSR = 0x07,
-
-        primUS = 0x14,
-        primPUS = 0x15,
-        primRUS = 0x16,
-        primPUSR = 0x17,
-
-        // group
-        groupP = 0x09,
-        groupR = 0x0A,
-        groupPR = 0x0B,
-        groupS = 0x0C,
-        groupPS = 0x0D,
-        groupRS = 0x0E,
-        groupPSR = 0x0F,
-
-        groupUS = 0x1C,
-        groupPUS = 0x1D,
-        groupRUS = 0x1E,
-        groupPUSR = 0x1F,
-
-        PRSmask = 0x07
-    }
-
-    public struct ObjectChangeData
-    {
-        public Quaternion rotation;
-        public Vector3 position;
-        public Vector3 scale;
-        public ObjectChangeType change;
-    }
-}

OpenSim/Framework/ParcelMediaCommandEnum.cs

@@ -27,7 +27,7 @@
 
 namespace OpenSim.Framework
 {
-    public enum ParcelMediaCommandEnum : int
+    public enum ParcelMediaCommandEnum
     {
         Stop = 0,
         Pause = 1,

OpenSim/Framework/PluginLoader.cs

@@ -244,22 +244,13 @@ namespace OpenSim.Framework
             // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
             // occasionally seems to corrupt its addin cache
             // Hence, as a temporary solution we'll remove it before each startup
-
-            string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
-            string v0 = "addin-db-000";
-            string v1 = "addin-db-001";
-            if (customDir != null && customDir != String.Empty)
-            {
-                v0 = Path.Combine(customDir, v0);
-                v1 = Path.Combine(customDir, v1);
-            }
             try
             {
-                if (Directory.Exists(v0))
-                    Directory.Delete(v0, true);
+                if (Directory.Exists("addin-db-000"))
+                    Directory.Delete("addin-db-000", true);
 
-                if (Directory.Exists(v1))
-                    Directory.Delete(v1, true);
+                if (Directory.Exists("addin-db-001"))
+                    Directory.Delete("addin-db-001", true);
             }
             catch (IOException)
             {

OpenSim/Framework/PrimitiveBaseShape.cs

@@ -724,12 +724,7 @@ namespace OpenSim.Framework
                 return _lightColorR;
             }
             set {
-                if (value < 0)
-                    _lightColorR = 0;
-                else if (value > 1.0f)
-                    _lightColorR = 1.0f;
-                else
-                    _lightColorR = value;
+                _lightColorR = value;
             }
         }
 
@@ -738,12 +733,7 @@ namespace OpenSim.Framework
                 return _lightColorG;
             }
             set {
-                if (value < 0)
-                    _lightColorG = 0;
-                else if (value > 1.0f)
-                    _lightColorG = 1.0f;
-                else
-                    _lightColorG = value;
+                _lightColorG = value;
             }
         }
 
@@ -752,12 +742,7 @@ namespace OpenSim.Framework
                 return _lightColorB;
             }
             set {
-                if (value < 0)
-                    _lightColorB = 0;
-                else if (value > 1.0f)
-                    _lightColorB = 1.0f;
-                else
-                    _lightColorB = value;
+                _lightColorB = value;
             }
         }
 
@@ -766,12 +751,7 @@ namespace OpenSim.Framework
                 return _lightColorA;
             }
             set {
-                if (value < 0)
-                    _lightColorA = 0;
-                else if (value > 1.0f)
-                    _lightColorA = 1.0f;
-                else
-                    _lightColorA = value;
+                _lightColorA = value;
             }
         }
 
@@ -884,11 +864,6 @@ namespace OpenSim.Framework
         }
 
         public ulong GetMeshKey(Vector3 size, float lod)
-        {
-            return GetMeshKey(size, lod, false);
-        }
-
-        public ulong GetMeshKey(Vector3 size, float lod, bool convex)
         {
             ulong hash = 5381;
 
@@ -935,9 +910,6 @@ namespace OpenSim.Framework
                     hash = djb2(hash, scaleBytes[i]);
             }
 
-            if(convex)
-                hash = djb2(hash, 0xa5);
-
             return hash;
         }
 
@@ -1442,7 +1414,7 @@ namespace OpenSim.Framework
             prim.Textures = this.Textures;
 
             prim.Properties = new Primitive.ObjectProperties();
-            prim.Properties.Name = "Object";
+            prim.Properties.Name = "Primitive";
             prim.Properties.Description = "";
             prim.Properties.CreatorID = UUID.Zero;
             prim.Properties.GroupID = UUID.Zero;

OpenSim/Framework/RegionInfo.cs

@@ -40,7 +40,6 @@ using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework
 {
-    [Serializable]
     public class RegionLightShareData : ICloneable
     {
         public bool valid = false;
@@ -103,7 +102,6 @@ namespace OpenSim.Framework
 
         public bool commFailTF = false;
         public ConfigurationMember configMember;
-        public string DataStore = String.Empty;
         public string RegionFile = String.Empty;
         public bool isSandbox = false;
         public bool Persistent = true;
@@ -651,9 +649,6 @@ namespace OpenSim.Framework
             string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
             config.Set("Location", location);
 
-            if (DataStore != String.Empty)
-                config.Set("Datastore", DataStore);
-
             config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
             config.Set("InternalPort", m_internalEndPoint.Port);
 
@@ -839,9 +834,6 @@ namespace OpenSim.Framework
                 case "sim_location_y":
                     m_regionLocY = (uint) configuration_result;
                     break;
-                case "datastore":
-                    DataStore = (string) configuration_result;
-                    break;
                 case "internal_ip_address":
                     IPAddress address = (IPAddress) configuration_result;
                     m_internalEndPoint = new IPEndPoint(address, 0);
@@ -992,11 +984,6 @@ namespace OpenSim.Framework
             return regionInfo;
         }
 
-        public int getInternalEndPointPort()
-        {
-            return m_internalEndPoint.Port;
-        }
-
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -1015,4 +1002,4 @@ namespace OpenSim.Framework
             return kvp;
         }
     }
-}
+}

OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs

@@ -48,9 +48,6 @@ namespace OpenSim.Framework.RegionLoader.Web
 
         public RegionInfo[] LoadRegions()
         {
-            int tries = 3;
-            int wait = 2000;
-
             if (m_configSource == null)
             {
                 m_log.Error("[WEBLOADER]: Unable to load configuration source!");
@@ -69,72 +66,63 @@ namespace OpenSim.Framework.RegionLoader.Web
                 }
                 else
                 {
-					while(tries > 0)
-					{
-						RegionInfo[] regionInfos = new RegionInfo[] {};
-						int regionCount = 0;
-						HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
-						webRequest.Timeout = 30000; //30 Second Timeout
-						m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
+                    RegionInfo[] regionInfos = new RegionInfo[] {};
+                    int regionCount = 0;
+                    HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
+                    webRequest.Timeout = 30000; //30 Second Timeout
+                    m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
 
-						try
-						{
-							HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
-							m_log.Debug("[WEBLOADER]: Downloading region information...");
-							StreamReader reader = new StreamReader(webResponse.GetResponseStream());
-							string xmlSource = String.Empty;
-							string tempStr = reader.ReadLine();
-							while (tempStr != null)
-							{
-								xmlSource = xmlSource + tempStr;
-								tempStr = reader.ReadLine();
-							}
-							m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
-										xmlSource.Length);
-							XmlDocument xmlDoc = new XmlDocument();
-							xmlDoc.LoadXml(xmlSource);
-							if (xmlDoc.FirstChild.Name == "Regions")
-							{
-								regionCount = xmlDoc.FirstChild.ChildNodes.Count;
-		
-								if (regionCount > 0)
-								{
-									regionInfos = new RegionInfo[regionCount];
-									int i;
-									for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
-									{
-										m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
-										regionInfos[i] =
-											new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
-									}
-								}
-							}
-						}
-						catch (WebException ex)
-						{
-							if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
-							{
-								if (!allowRegionless)
-									throw ex;
-							}
-							else
-								throw ex;
-						}
-
-						if (regionCount > 0 | allowRegionless)
-							return regionInfos;
-
-                        m_log.Debug("[WEBLOADER]: Request yielded no regions.");
-                        tries--;
-                        if (tries > 0)
+                    try
+                    {
+                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
+                        m_log.Debug("[WEBLOADER]: Downloading region information...");
+                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                        string xmlSource = String.Empty;
+                        string tempStr = reader.ReadLine();
+                        while (tempStr != null)
                         {
-                            m_log.Debug("[WEBLOADER]: Retrying");
-                            System.Threading.Thread.Sleep(wait);
+                            xmlSource = xmlSource + tempStr;
+                            tempStr = reader.ReadLine();
                         }
-					}
+                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                    xmlSource.Length);
+                        XmlDocument xmlDoc = new XmlDocument();
+                        xmlDoc.LoadXml(xmlSource);
+                        if (xmlDoc.FirstChild.Name == "Regions")
+                        {
+                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
+    
+                            if (regionCount > 0)
+                            {
+                                regionInfos = new RegionInfo[regionCount];
+                                int i;
+                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                                {
+                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                                    regionInfos[i] =
+                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                                }
+                            }
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
+                        {
+                            if (!allowRegionless)
+                                throw ex;
+                        }
+                        else
+                            throw ex;
+                    }
 
-					m_log.Error("[WEBLOADER]: No region configs were available.");
-					return null;
+                    if (regionCount > 0 | allowRegionless)
+                        return regionInfos;
+                    else
+                    {
+                        m_log.Error("[WEBLOADER]: No region configs were available.");
+                        return null;
+                    }
                 }
             }
         }

OpenSim/Framework/RegionSettings.cs

@@ -482,28 +482,6 @@ namespace OpenSim.Framework
             set { m_LoadedCreationID = value; }
         }
 
-        private bool m_GodBlockSearch = false;
-        public bool GodBlockSearch
-        {
-            get { return m_GodBlockSearch; }
-            set { m_GodBlockSearch = value; }
-        }
-
-        private bool m_Casino = false;
-        public bool Casino
-        {
-            get { return m_Casino; }
-            set { m_Casino = value; }
-        }
-
-        // Telehub support
-        private bool m_TelehubEnabled = false;
-        public bool HasTelehub
-        {
-            get { return m_TelehubEnabled; }
-            set { m_TelehubEnabled = value; }
-        }
-
         // Connected Telehub object
         private UUID m_TelehubObject = UUID.Zero;
         public UUID TelehubObject

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -42,9 +42,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
+//        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>>();
@@ -163,7 +161,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static LandData Deserialize(byte[] serializedLandData)
         {
-            return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
+            return Deserialize(Encoding.UTF8.GetString(serializedLandData, 0, serializedLandData.Length));
         }
 
         /// <summary>

OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs

@@ -40,8 +40,6 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class RegionSettingsSerializer
     {
-        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
-        
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -50,7 +48,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static RegionSettings Deserialize(byte[] serializedSettings)
         {
-            return Deserialize(m_asciiEncoding.GetString(serializedSettings, 0, serializedSettings.Length));
+            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
         }
         
         /// <summary>

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/TarArchiveReader.cs

@@ -53,8 +53,6 @@ namespace OpenSim.Framework.Serialization
             TYPE_CONTIGUOUS_FILE = 8,
         }
 
-        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
-
         /// <summary>
         /// Binary reader for the underlying stream
         /// </summary>
@@ -120,13 +118,13 @@ namespace OpenSim.Framework.Serialization
             if (header[156] == (byte)'L')
             {
                 int longNameLength = ConvertOctalBytesToDecimal(header, 124, 11);
-                tarHeader.FilePath = m_asciiEncoding.GetString(ReadData(longNameLength));
+                tarHeader.FilePath = Encoding.ASCII.GetString(ReadData(longNameLength));
                 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got long file name {0}", tarHeader.FilePath);
                 header = m_br.ReadBytes(512);
             }
             else
             {
-                tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
+                tarHeader.FilePath = Encoding.ASCII.GetString(header, 0, 100);
                 tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray);
                 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath);
             }
@@ -205,7 +203,7 @@ namespace OpenSim.Framework.Serialization
         {
             // Trim leading white space: ancient tars do that instead
             // of leading 0s :-( don't ask. really.
-            string oString = m_asciiEncoding.GetString(bytes, startIndex, count).TrimStart(m_spaceCharArray);
+            string oString = Encoding.ASCII.GetString(bytes, startIndex, count).TrimStart(m_spaceCharArray);
 
             int d = 0;
 

OpenSim/Framework/Serialization/TarArchiveWriter.cs

@@ -41,9 +41,6 @@ namespace OpenSim.Framework.Serialization
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
-        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
-
         /// <summary>
         /// Binary writer for the underlying stream
         /// </summary>
@@ -74,7 +71,7 @@ namespace OpenSim.Framework.Serialization
         /// <param name="data"></param>
         public void WriteFile(string filePath, string data)
         {
-            WriteFile(filePath, m_utf8Encoding.GetBytes(data));
+            WriteFile(filePath, Util.UTF8NoBomEncoding.GetBytes(data));
         }
 
         /// <summary>
@@ -85,7 +82,7 @@ namespace OpenSim.Framework.Serialization
         public void WriteFile(string filePath, byte[] data)
         {
             if (filePath.Length > 100)
-                WriteEntry("././@LongLink", m_asciiEncoding.GetBytes(filePath), 'L');
+                WriteEntry("././@LongLink", Encoding.ASCII.GetBytes(filePath), 'L');
 
             char fileType;
 
@@ -137,7 +134,7 @@ namespace OpenSim.Framework.Serialization
                 oString = "0" + oString;
             }
 
-            byte[] oBytes = m_asciiEncoding.GetBytes(oString);
+            byte[] oBytes = Encoding.ASCII.GetBytes(oString);
 
             return oBytes;
         }
@@ -156,20 +153,20 @@ namespace OpenSim.Framework.Serialization
             byte[] header = new byte[512];
 
             // file path field (100)
-            byte[] nameBytes = m_asciiEncoding.GetBytes(filePath);
+            byte[] nameBytes = Encoding.ASCII.GetBytes(filePath);
             int nameSize = (nameBytes.Length >= 100) ? 100 : nameBytes.Length;
             Array.Copy(nameBytes, header, nameSize);
 
             // file mode (8)
-            byte[] modeBytes = m_asciiEncoding.GetBytes("0000777");
+            byte[] modeBytes = Encoding.ASCII.GetBytes("0000777");
             Array.Copy(modeBytes, 0, header, 100, 7);
 
             // owner user id (8)
-            byte[] ownerIdBytes = m_asciiEncoding.GetBytes("0000764");
+            byte[] ownerIdBytes = Encoding.ASCII.GetBytes("0000764");
             Array.Copy(ownerIdBytes, 0, header, 108, 7);
 
             // group user id (8)
-            byte[] groupIdBytes = m_asciiEncoding.GetBytes("0000764");
+            byte[] groupIdBytes = Encoding.ASCII.GetBytes("0000764");
             Array.Copy(groupIdBytes, 0, header, 116, 7);
 
             // file size in bytes (12)
@@ -181,17 +178,17 @@ namespace OpenSim.Framework.Serialization
             Array.Copy(fileSizeBytes, 0, header, 124, 11);
 
             // last modification time (12)
-            byte[] lastModTimeBytes = m_asciiEncoding.GetBytes("11017037332");
+            byte[] lastModTimeBytes = Encoding.ASCII.GetBytes("11017037332");
             Array.Copy(lastModTimeBytes, 0, header, 136, 11);
 
             // entry type indicator (1)
-            header[156] = m_asciiEncoding.GetBytes(new char[] { fileType })[0];
+            header[156] = Encoding.ASCII.GetBytes(new char[] { fileType })[0];
 
-            Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 329, 7);
-            Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 337, 7);
+            Array.Copy(Encoding.ASCII.GetBytes("0000000"), 0, header, 329, 7);
+            Array.Copy(Encoding.ASCII.GetBytes("0000000"), 0, header, 337, 7);
 
             // check sum for header block (8) [calculated last]
-            Array.Copy(m_asciiEncoding.GetBytes("        "), 0, header, 148, 8);
+            Array.Copy(Encoding.ASCII.GetBytes("        "), 0, header, 148, 8);
 
             int checksum = 0;
             foreach (byte b in header)

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -308,7 +308,7 @@ namespace OpenSim.Framework.Servers
 
             EnhanceVersionInformation();
             
-            m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine);
+            m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
             // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
             // the clr version number doesn't match the project version number under Mono.
             //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
@@ -591,8 +591,8 @@ namespace OpenSim.Framework.Servers
             {
                 string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
                 FileStream fs = File.Create(path);
-                System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
-                Byte[] buf = enc.GetBytes(pidstring);
+
+                Byte[] buf = Encoding.ASCII.GetBytes(pidstring);
                 fs.Write(buf, 0, buf.Length);
                 fs.Close();
                 m_pidFile = path;

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -1447,34 +1447,10 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
         {
-            int responsecode;
-            string responseString;
-            string contentType;
-
-            if (responsedata == null)
-            {
-                responsecode = 500;
-                responseString = "No response could be obtained";
-                contentType = "text/plain";
-                responsedata = new Hashtable();
-            }
-            else
-            {
-                try
-                {
-                    //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
-                    responsecode = (int)responsedata["int_response_code"];
-                    responseString = (string)responsedata["str_response_string"];
-                    contentType = (string)responsedata["content_type"];
-                }
-                catch
-                {
-                    responsecode = 500;
-                    responseString = "No response could be obtained";
-                    contentType = "text/plain";
-                    responsedata = new Hashtable();
-                }
-            }
+            //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
+            int responsecode = (int)responsedata["int_response_code"];
+            string responseString = (string)responsedata["str_response_string"];
+            string contentType = (string)responsedata["content_type"];
 
             if (responsedata.ContainsKey("error_status_text"))
             {

OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs

@@ -41,7 +41,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly BaseHttpServer m_server;
         private static Queue m_requests = Queue.Synchronized(new Queue());
-        private static ManualResetEvent m_ev = new ManualResetEvent(false);
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
         private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
@@ -91,17 +90,15 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             lock (m_requests)
                 m_requests.Enqueue(req);
-            m_ev.Set();
         }
 
         public void ThreadStart()
         {
             while (m_running)
             {
-                m_ev.WaitOne(1000);
-                m_ev.Reset();
                 Watchdog.UpdateThread();
                 ProcessQueuedRequests();
+                Thread.Sleep(1000);
             }
         }
 
@@ -157,4 +154,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_running = false;
         }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

@@ -89,15 +89,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                             continue;
                         }
 
-                        try
-                        {
-                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
-                            DoHTTPGruntWork(m_server, req, responsedata);
-                        }
-                        catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
-                        {
-                            // Ignore it, no need to reply
-                        }
+                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
+                        DoHTTPGruntWork(m_server, req, responsedata);
                     }
                     else
                     {
@@ -168,4 +161,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
+}

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,11 +29,11 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.4CM";
+        private const string VERSION_NUMBER = "0.7.4";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-        { 
+        {
             Unknown,
             Dev,
             RC1,
@@ -50,7 +50,7 @@ namespace OpenSim
 
         public static string GetVersionString(string versionNumber, Flavour flavour)
         {
-            string versionString = "Careminster " + versionNumber + " " + flavour;
+            string versionString = "OpenSim " + versionNumber + " " + flavour;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 

OpenSim/Framework/TaskInventoryDictionary.cs

@@ -27,13 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Reflection;
 using System.Xml;
-using System.Diagnostics;
 using System.Xml.Schema;
 using System.Xml.Serialization;
-using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -49,180 +45,6 @@ namespace OpenSim.Framework
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private Thread LockedByThread;
-//        private string WriterStack;
-
-//        private Dictionary<Thread, string> ReadLockers =
-//                new Dictionary<Thread, string>();
-
-        /// <value>
-        /// An advanced lock for inventory data
-        /// </value>
-        private System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
-
-        /// <summary>
-        /// Are we readlocked by the calling thread?
-        /// </summary>
-        public bool IsReadLockedByMe()
-        {
-            if (m_itemLock.RecursiveReadCount > 0)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Lock our inventory list for reading (many can read, one can write)
-        /// </summary>
-        public void LockItemsForRead(bool locked)
-        {
-            if (locked)
-            {
-                if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
-                {
-                    if (!LockedByThread.IsAlive)
-                    {
-                        //Locked by dead thread, reset.
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim(); 
-                    }
-                }
-
-                if (m_itemLock.RecursiveReadCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
-                    try
-                    {
-                        // That call stack is useful for end users only. RealProgrammers need a full dump. Commented.
-                        // StackTrace stackTrace = new StackTrace();           // get call stack
-                        // StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
-                        //
-                        // // write call stack method names
-                        // foreach (StackFrame stackFrame in stackFrames)
-                        // {
-                        //     m_log.Error("[SceneObjectGroup.m_parts]  "+(stackFrame.GetMethod().Name));   // write method name
-                        // }
-
-                        // The below is far more useful
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
-//                        {
-//                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
-//                            System.Console.WriteLine("------------------------------------------");
-//                        }
-                    }
-                    catch
-                    {}
-                    m_itemLock.ExitReadLock();
-                }
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
-//                    try
-//                    {
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
-//                        System.Console.WriteLine("------------------------------------------");
-//                    }
-//                    catch
-//                    {}
-                    m_itemLock.ExitWriteLock();
-                }
-                
-                while (!m_itemLock.TryEnterReadLock(60000))
-                {
-                    m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-                    if (m_itemLock.IsWriteLockHeld)
-                    {
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        LockedByThread = null;
-//                        ReadLockers.Clear();
-                    }
-                }
-//                ReadLockers[Thread.CurrentThread] = Environment.StackTrace;
-            }
-            else
-            {
-                if (m_itemLock.RecursiveReadCount>0)
-                {
-                    m_itemLock.ExitReadLock();
-                }
-//                if (m_itemLock.RecursiveReadCount == 0)
-//                    ReadLockers.Remove(Thread.CurrentThread);
-            }
-        }
-
-        /// <summary>
-        /// Lock our inventory list for writing (many can read, one can write)
-        /// </summary>
-        public void LockItemsForWrite(bool locked)
-        {
-            if (locked)
-            {
-                //Enter a write lock, wait indefinately for one to open.
-                if (m_itemLock.RecursiveReadCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
-                    m_itemLock.ExitReadLock();
-                }
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
-
-                    m_itemLock.ExitWriteLock();
-                }
-                while (!m_itemLock.TryEnterWriteLock(60000))
-                {
-                    if (m_itemLock.IsWriteLockHeld)
-                    {
-                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
-//                        System.Console.WriteLine("------------------------------------------");
-                    }
-                    else
-                    {
-                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by a reader. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-//                        System.Console.WriteLine("------------------------------------------");
-//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-//                        System.Console.WriteLine("------------------------------------------");
-//                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
-//                        {
-//                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
-//                            System.Console.WriteLine("------------------------------------------");
-//                        }
-                    }
-                    m_itemLock = new System.Threading.ReaderWriterLockSlim();
-//                    ReadLockers.Clear();
-                }
-
-                LockedByThread = Thread.CurrentThread;
-//                WriterStack = Environment.StackTrace;
-            }
-            else
-            {
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_itemLock.ExitWriteLock();
-                }
-            }
-        }
 
         #region ICloneable Members
 
@@ -230,13 +52,14 @@ namespace OpenSim.Framework
         {
             TaskInventoryDictionary clone = new TaskInventoryDictionary();
 
-            m_itemLock.EnterReadLock();
-            foreach (UUID uuid in Keys)
+            lock (this)
             {
-                clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
+                foreach (UUID uuid in Keys)
+                {
+                    clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
+                }
             }
-            m_itemLock.ExitReadLock();
-
+            
             return clone;
         }
 

OpenSim/Framework/TaskInventoryItem.cs

@@ -72,7 +72,7 @@ namespace OpenSim.Framework
         private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
-        
+
         // This used ONLY during copy. It can't be relied on at other times!
         private bool _scriptRunning = true;
 

OpenSim/Framework/Tests/MundaneFrameworkTests.cs

@@ -217,12 +217,12 @@ namespace OpenSim.Framework.Tests
                               BannedHostNameMask = string.Empty,
                               BannedUserID = bannedUserId}
                           );
-            Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not.");
-            Assert.IsFalse(es.IsBanned(UUID.Zero, 32), "User Should not be banned but is.");
+            Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not.");
+            Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is.");
 
             es.RemoveBan(bannedUserId);
 
-            Assert.IsFalse(es.IsBanned(bannedUserId, 32), "User Should not be banned but is.");
+            Assert.IsFalse(es.IsBanned(bannedUserId), "User Should not be banned but is.");
 
             es.AddEstateManager(UUID.Zero);
 

OpenSim/Framework/Util.cs

@@ -148,6 +148,7 @@ namespace OpenSim.Framework
         }
 
         public static Encoding UTF8 = Encoding.UTF8;
+        public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
 
         /// <value>
         /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
@@ -480,25 +481,19 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-
         public static string Md5Hash(string data)
         {
-            return Md5Hash(data, Encoding.Default);
-        }
-
-        public static string Md5Hash(string data, Encoding encoding)
-        {
-            byte[] dataMd5 = ComputeMD5Hash(data, encoding);
+            byte[] dataMd5 = ComputeMD5Hash(data);
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < dataMd5.Length; i++)
                 sb.AppendFormat("{0:x2}", dataMd5[i]);
             return sb.ToString();
         }
 
-        private static byte[] ComputeMD5Hash(string data, Encoding encoding)
+        private static byte[] ComputeMD5Hash(string data)
         {
             MD5 md5 = MD5.Create();
-            return md5.ComputeHash(encoding.GetBytes(data));
+            return md5.ComputeHash(Encoding.Default.GetBytes(data));
         }
 
         /// <summary>
@@ -506,12 +501,6 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-
-        public static string SHA1Hash(string data, Encoding enc)
-        {
-            return SHA1Hash(enc.GetBytes(data));
-        }
-
         public static string SHA1Hash(string data)
         {
             return SHA1Hash(Encoding.Default.GetBytes(data));
@@ -1116,19 +1105,19 @@ namespace OpenSim.Framework
         {
             string os = String.Empty;
 
-//            if (Environment.OSVersion.Platform != PlatformID.Unix)
-//            {
-//                os = Environment.OSVersion.ToString();
-//            }
-//            else
-//            {
-//                os = ReadEtcIssue();
-//            }
-//                      
-//            if (os.Length > 45)
-//            {
-//                os = os.Substring(0, 45);
-//            }
+            if (Environment.OSVersion.Platform != PlatformID.Unix)
+            {
+                os = Environment.OSVersion.ToString();
+            }
+            else
+            {
+                os = ReadEtcIssue();
+            }
+                      
+            if (os.Length > 45)
+            {
+                os = os.Substring(0, 45);
+            }
             
             return os;
         }
@@ -1248,8 +1237,7 @@ namespace OpenSim.Framework
 
         public static string Base64ToString(string str)
         {
-            UTF8Encoding encoder = new UTF8Encoding();
-            Decoder utf8Decode = encoder.GetDecoder();
+            Decoder utf8Decode = Encoding.UTF8.GetDecoder();
 
             byte[] todecode_byte = Convert.FromBase64String(str);
             int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length);
@@ -1261,7 +1249,7 @@ namespace OpenSim.Framework
 
         public static Guid GetHashGuid(string data, string salt)
         {
-            byte[] hash = ComputeMD5Hash(data + salt, Encoding.Default);
+            byte[] hash = ComputeMD5Hash(data + salt);
 
             //string s = BitConverter.ToString(hash);
 

OpenSim/Framework/Watchdog.cs

@@ -41,8 +41,8 @@ namespace OpenSim.Framework
         /// <summary>Timer interval in milliseconds for the watchdog timer</summary>
         const double WATCHDOG_INTERVAL_MS = 2500.0d;
 
-        /// <summary>Maximum timeout in milliseconds before a thread is considered dead</summary>
-        public const int WATCHDOG_TIMEOUT_MS = 5000;
+        /// <summary>Default timeout in milliseconds before a thread is considered dead</summary>
+        public const int DEFAULT_WATCHDOG_TIMEOUT_MS = 5000;
 
         [System.Diagnostics.DebuggerDisplay("{Thread.Name}")]
         public class ThreadWatchdogInfo
@@ -101,12 +101,24 @@ namespace OpenSim.Framework
         private static Dictionary<int, ThreadWatchdogInfo> m_threads;
         private static System.Timers.Timer m_watchdogTimer;
 
+        /// <summary>
+        /// Last time the watchdog thread ran.
+        /// </summary>
+        /// <remarks>
+        /// Should run every WATCHDOG_INTERVAL_MS
+        /// </remarks>
+        public static int LastWatchdogThreadTick { get; private set; }
+
         static Watchdog()
         {
             m_threads = new Dictionary<int, ThreadWatchdogInfo>();
             m_watchdogTimer = new System.Timers.Timer(WATCHDOG_INTERVAL_MS);
             m_watchdogTimer.AutoReset = false;
             m_watchdogTimer.Elapsed += WatchdogTimerElapsed;
+
+            // Set now so we don't get alerted on the first run
+            LastWatchdogThreadTick = Environment.TickCount & Int32.MaxValue;
+
             m_watchdogTimer.Start();
         }
 
@@ -122,7 +134,7 @@ namespace OpenSim.Framework
         public static Thread StartThread(
             ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout)
         {
-            return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, WATCHDOG_TIMEOUT_MS);
+            return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, DEFAULT_WATCHDOG_TIMEOUT_MS);
         }
 
         /// <summary>
@@ -264,6 +276,16 @@ namespace OpenSim.Framework
         /// <param name="e"></param>
         private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
+            int now = Environment.TickCount & Int32.MaxValue;
+            int msElapsed = now - LastWatchdogThreadTick;
+
+            if (msElapsed > WATCHDOG_INTERVAL_MS * 2)
+                m_log.WarnFormat(
+                    "[WATCHDOG]: {0} ms since Watchdog last ran.  Interval should be approximately {1} ms",
+                    msElapsed, WATCHDOG_INTERVAL_MS);
+
+            LastWatchdogThreadTick = Environment.TickCount & Int32.MaxValue;
+
             Action<ThreadWatchdogInfo> callback = OnWatchdogTimeout;
 
             if (callback != null)
@@ -272,8 +294,6 @@ namespace OpenSim.Framework
 
                 lock (m_threads)
                 {
-                    int now = Environment.TickCount;
-
                     foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
                     {
                         if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
@@ -308,4 +328,4 @@ namespace OpenSim.Framework
             m_watchdogTimer.Start();
         }
     }
-}
+}

OpenSim/Framework/WebUtil.cs

@@ -223,7 +223,6 @@ namespace OpenSim.Framework
             catch (Exception ex)
             {
                 errorMessage = ex.Message;
-                m_log.Debug("[WEB UTIL]: Exception making request: " + ex.ToString());
             }
             finally
             {
@@ -303,7 +302,7 @@ namespace OpenSim.Framework
         /// </summary>
         public static OSDMap PostToService(string url, NameValueCollection data)
         {
-            return ServiceFormRequest(url,data, 20000);
+            return ServiceFormRequest(url,data,10000);
         }
         
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -997,11 +996,6 @@ namespace OpenSim.Framework
         /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
-        {
-            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
-        }
-
-        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
         {
             int reqnum = WebUtil.RequestNumber++;
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
@@ -1014,8 +1008,6 @@ namespace OpenSim.Framework
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
-            if (pTimeout != 0)
-                request.Timeout = pTimeout * 1000;
             MemoryStream buffer = null;
 
             if ((verb == "POST") || (verb == "PUT"))
@@ -1131,4 +1123,4 @@ namespace OpenSim.Framework
             return deserial;
         }
     }
-}
+}

OpenSim/Region/Application/Application.cs

@@ -92,9 +92,14 @@ namespace OpenSim
                 m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
             }
 
-            m_log.DebugFormat(
+            m_log.InfoFormat(
                 "[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture);
 
+            string monoThreadsPerCpu = System.Environment.GetEnvironmentVariable("MONO_THREADS_PER_CPU");
+
+            m_log.InfoFormat(
+                "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
+
             // Increase the number of IOCP threads available. Mono defaults to a tragically low number
             int workerThreads, iocpThreads;
             System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
@@ -109,7 +114,6 @@ namespace OpenSim
 
             // Check if the system is compatible with OpenSimulator.
             // Ensures that the minimum system requirements are met
-            m_log.Info("Performing compatibility checks... \n");
             string supported = String.Empty;
             if (Util.IsEnvironmentSupported(ref supported))
             {

OpenSim/Region/Application/OpenSim.cs

@@ -479,7 +479,7 @@ namespace OpenSim
                     if (alert != null)
                         presence.ControllingClient.Kick(alert);
                     else
-                        presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
+                        presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
                     presence.Scene.IncomingCloseAgent(presence.UUID);
                 }
@@ -996,44 +996,11 @@ namespace OpenSim
                     break;
 
                 case "connections":
-                    System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n");
-                    m_sceneManager.ForEachScene(
-                        delegate(Scene scene) {
-                        scene.ForEachClient(
-                                delegate(IClientAPI client) {
-                            connections.AppendFormat(
-                                "{0}: {1} ({2}) from {3} on circuit {4}\n",
-                                scene.RegionInfo.RegionName,
-                                client.Name,
-                                client.AgentId,
-                                client.RemoteEndPoint,
-                                client.CircuitCode
-                            );
-                        }
-                        );
-                    }
-                    );
-
-                    MainConsole.Instance.Output(connections.ToString());
+                    HandleShowConnections();
                     break;
 
                 case "circuits":
-                    System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n");
-                    m_sceneManager.ForEachScene(
-                        delegate(Scene scene) {
-                        //this.HttpServer.
-                        acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName);
-                        foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.GetAgentCircuits().Values)
-                            acd.AppendFormat(
-                                "\t{0} {1} ({2})\n",
-                                aCircuit.firstname,
-                                aCircuit.lastname,
-                                (aCircuit.child ? "Child" : "Root")
-                            );
-                    }
-                    );
-
-                    MainConsole.Instance.Output(acd.ToString());
+                    HandleShowCircuits();
                     break;
 
                 case "http-handlers":
@@ -1138,6 +1105,53 @@ namespace OpenSim
             }
         }
 
+        private void HandleShowCircuits()
+        {
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Region", 20);
+            cdt.AddColumn("Avatar name", 24);
+            cdt.AddColumn("Type", 5);
+            cdt.AddColumn("Code", 10);
+            cdt.AddColumn("IP", 16);
+            cdt.AddColumn("Viewer Name", 24);
+
+            m_sceneManager.ForEachScene(
+                s =>
+                {
+                    foreach (AgentCircuitData aCircuit in s.AuthenticateHandler.GetAgentCircuits().Values)
+                        cdt.AddRow(
+                            s.Name,
+                            aCircuit.Name,
+                            aCircuit.child ? "child" : "root",
+                            aCircuit.circuitcode.ToString(),
+                            aCircuit.IPAddress.ToString(),
+                            aCircuit.Viewer);
+                });
+
+            MainConsole.Instance.Output(cdt.ToString());
+        }
+
+        private void HandleShowConnections()
+        {
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Region", 20);
+            cdt.AddColumn("Avatar name", 24);
+            cdt.AddColumn("Circuit code", 12);
+            cdt.AddColumn("Endpoint", 23);
+            cdt.AddColumn("Active?", 7);
+
+            m_sceneManager.ForEachScene(
+                s => s.ForEachClient(
+                    c => cdt.AddRow(
+                        s.Name,
+                        c.Name,
+                        c.RemoteEndPoint.ToString(),
+                        c.CircuitCode.ToString(),
+                        c.IsActive.ToString())));
+
+            MainConsole.Instance.Output(cdt.ToString());
+        }
+
         /// <summary>
         /// Use XML2 format to serialize data to a file
         /// </summary>
@@ -1207,7 +1221,7 @@ namespace OpenSim
                         MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
                     }
                 }
-                m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
+                m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset);
             }
             else
             {

OpenSim/Region/Application/OpenSimBase.cs

@@ -97,10 +97,6 @@ namespace OpenSim
 
         protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
-        private List<string> m_permsModules;
-
-        private bool m_securePermissionsLoading = true;
-
         /// <value>
         /// The config information passed into the OpenSimulator region server.
         /// </value>
@@ -205,11 +201,6 @@ namespace OpenSim
                     CreatePIDFile(pidFile);
                 
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
-
-                m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
-
-                string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule");
-                m_permsModules = new List<string>(permissionModules.Split(','));
             }
 
             // Load the simulation data service
@@ -238,12 +229,6 @@ namespace OpenSim
             m_moduleLoader = new ModuleLoader(m_config.Source);
 
             LoadPlugins();
-
-            if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
-            {
-                Environment.Exit(1);
-            }
-
             foreach (IApplicationPlugin plugin in m_plugins)
             {
                 plugin.PostInitialise();
@@ -394,41 +379,7 @@ namespace OpenSim
             }
             else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
 
-            if (m_securePermissionsLoading)
-            {
-                foreach (string s in m_permsModules)
-                {
-                    if (!scene.RegionModules.ContainsKey(s))
-                    {
-                        bool found = false;
-                        foreach (IRegionModule m in modules)
-                        {
-                            if (m.Name == s)
-                            {
-                                found = true;
-                            }
-                        }
-                        if (!found)
-                        {
-                            m_log.Fatal("[MODULES]: Required module " + s + " not found.");
-                            Environment.Exit(0);
-                        }
-                    }
-                }
-            }
-
             scene.SetModuleInterfaces();
-// First Step of bootreport sequence
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.ColdStart(1,scene);
-                scene.SnmpService.LinkDown(scene);
-            }
-
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Loading prins", scene);
-            }
 
             while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
                 SetUpEstateOwner(scene);
@@ -442,11 +393,6 @@ namespace OpenSim
             scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
             scene.EventManager.TriggerParcelPrimCountUpdate();
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
-            } 
-
             try
             {
                 scene.RegisterRegionWithGrid();
@@ -457,29 +403,15 @@ namespace OpenSim
                     "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 
                     e.Message, e.StackTrace);
 
-                if (scene.SnmpService != null)
-                {
-                    scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
-                }
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
                 Environment.Exit(1);
             }
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Grid Registration done", scene);
-            }
-
             // We need to do this after we've initialized the
             // scripting engines.
             scene.CreateScriptInstances();
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("ScriptEngine started", scene);
-            }
-
             m_sceneManager.Add(scene);
 
             if (m_autoCreateClientStack)
@@ -488,10 +420,6 @@ namespace OpenSim
                 clientServer.Start();
             }
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Initializing region modules", scene);
-            }
             if (do_post_init)
             {
                 foreach (IRegionModule module in modules)
@@ -503,12 +431,6 @@ namespace OpenSim
 
             mscene = scene;
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("The region is operational", scene);
-                scene.SnmpService.LinkUp(scene);
-            }
-
             scene.Start();
 
             scene.StartScripts();
@@ -628,11 +550,6 @@ namespace OpenSim
         private void ShutdownRegion(Scene scene)
         {
             m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("The region is shutting down", scene);
-                scene.SnmpService.LinkDown(scene);
-            }
             IRegionModulesController controller;
             if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
             {

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

@@ -96,10 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden
         //        private static readonly string m_fetchInventoryPath = "0006/";
         private static readonly string m_copyFromNotecardPath = "0007/";
         // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
-        private static readonly string m_getObjectPhysicsDataPath = "0101/";
-        private static readonly string m_getObjectCostPath = "0102/";
-        private static readonly string m_ResourceCostSelectedPath = "0103/";
-        
+
 
         // These are callbacks which will be setup by the scene so that we can update scene data when we
         // receive capability calls
@@ -202,14 +199,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
-                IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData);
-                m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler);
-                IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost);
-                m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler);
-                IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected);
-                m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler);
-           
-
 
                 m_HostCapsObj.RegisterHandler(
                     "CopyInventoryFromNotecard",
@@ -860,151 +849,6 @@ namespace OpenSim.Region.ClientStack.Linden
             response["int_response_code"] = 200;
             return LLSDHelpers.SerialiseLLSDReply(response);
         }
-
-        public string GetObjectPhysicsData(string request, string path,
-                string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
-        {
-            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-            OSDArray object_ids = (OSDArray)req["object_ids"];
-
-            for (int i = 0 ; i < object_ids.Count ; i++)
-            {
-                UUID uuid = object_ids[i].AsUUID();
-
-                SceneObjectPart obj = m_Scene.GetSceneObjectPart(uuid);
-                if (obj != null)
-                {
-                    OSDMap object_data = new OSDMap();
-
-                    object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
-                    object_data["Density"] = obj.Density;
-                    object_data["Friction"] = obj.Friction;
-                    object_data["Restitution"] = obj.Bounciness;
-                    object_data["GravityMultiplier"] = obj.GravityModifier;
-
-                    resp[uuid.ToString()] = object_data;
-                }
-            }
-
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response;
-        }
-
-        public string GetObjectCost(string request, string path,
-                string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
-        {          
-            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-
-            OSDArray object_ids = (OSDArray)req["object_ids"];
-
-            for (int i = 0; i < object_ids.Count; i++)
-            {
-                UUID uuid = object_ids[i].AsUUID();
-                                
-                SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
-
-                if (part != null)
-                {
-                    SceneObjectGroup grp = part.ParentGroup;
-                    if (grp != null)
-                    {
-                        float linksetCost;
-                        float linksetPhysCost;
-                        float partCost;
-                        float partPhysCost;
-
-                        grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out  partPhysCost);
-
-                        OSDMap object_data = new OSDMap();
-                        object_data["linked_set_resource_cost"] = linksetCost;
-                        object_data["resource_cost"] = partCost;
-                        object_data["physics_cost"] = partPhysCost;
-                        object_data["linked_set_physics_cost"] = linksetPhysCost;
-
-                        resp[uuid.ToString()] = object_data;
-                    }
-                }
-            }
-
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
-        }
-
-        public string ResourceCostSelected(string request, string path,
-                string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
-        {
-            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-
-
-            float phys=0;
-            float stream=0;
-            float simul=0;
-
-            if (req.ContainsKey("selected_roots"))
-            {
-                OSDArray object_ids = (OSDArray)req["selected_roots"];
-
-                // should go by SOG suming costs for all parts
-                // ll v3 works ok with several objects select we get the list and adds ok
-                // FS calls per object so results are wrong guess fs bug
-                for (int i = 0; i < object_ids.Count; i++)
-                {
-                    UUID uuid = object_ids[i].AsUUID();
-                    float Physc;
-                    float simulc;
-                    float streamc;
-
-                    SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid);
-                    if (grp != null)
-                    {
-                        grp.GetSelectedCosts(out Physc, out streamc, out simulc);
-                        phys += Physc;
-                        stream += streamc;
-                        simul += simulc;
-                    }
-                }
-            }
-            else if (req.ContainsKey("selected_prims"))
-            {
-                OSDArray object_ids = (OSDArray)req["selected_prims"];
-
-                // don't see in use in any of the 2 viewers
-                // guess it should be for edit linked but... nothing
-                // should go to SOP per part
-                for (int i = 0; i < object_ids.Count; i++)
-                {
-                    UUID uuid = object_ids[i].AsUUID();
-
-                    SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
-                    if (part != null)
-                    {
-                        phys += part.PhysicsCost;
-                        stream += part.StreamingCost;
-                        simul += part.SimulationCost;
-                    }
-                }
-            }
-
-            if (simul != 0)
-            {
-                OSDMap object_data = new OSDMap();
-
-                object_data["physics"] = phys;
-                object_data["streaming"] = stream;
-                object_data["simulation"] = simul;
-
-                resp["selected"] = object_data;
-            }
-
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response; 
-        }
     }
 
     public class AssetUploader

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs

@@ -831,13 +831,5 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             return EventQueueHelper.BuildEvent(eventName, eventBody);
         }
-
-        public void partPhysicsProperties(uint localID, byte physhapetype,
-                        float density, float friction, float bounce, float gravmod,UUID avatarID)
-        {
-            OSD item = EventQueueHelper.partPhysicsProperties(localID, physhapetype,
-                        density, friction, bounce, gravmod);
-            Enqueue(item, avatarID);
-        }
     }
 }

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs

@@ -395,25 +395,5 @@ namespace OpenSim.Region.ClientStack.Linden
             return message;
         }
 
-        public static OSD partPhysicsProperties(uint localID, byte physhapetype,
-                        float density, float friction, float bounce, float gravmod)
-        {
-            
-            OSDMap physinfo = new OSDMap(6);
-            physinfo["LocalID"] = localID;
-            physinfo["Density"] = density;
-            physinfo["Friction"] = friction;
-            physinfo["GravityMultiplier"] = gravmod;
-            physinfo["Restitution"] = bounce;
-            physinfo["PhysicsShapeType"] = (int)physhapetype;
-
-            OSDArray array = new OSDArray(1);
-            array.Add(physinfo);
-
-            OSDMap llsdBody = new OSDMap(1);
-            llsdBody.Add("ObjectData", array);
-
-            return BuildEvent("ObjectPhysicsProperties", llsdBody);
-        }
     }
 }

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

@@ -234,9 +234,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             m_stopPacket = TexturePacketCount();
                         }
 
-                        //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
-                        if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
-
                         m_currentPacket = StartPacket;
                     }
                 }

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

@@ -158,7 +158,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
         private int m_maxRTO = 60000;
-        public bool m_deliverPackets = true;
 
         /// <summary>
         /// Default constructor
@@ -440,13 +439,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (category >= 0 && category < m_packetOutboxes.Length)
             {
                 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
-
-                if (m_deliverPackets == false)
-                {
-                    queue.Enqueue(packet);
-                    return true;
-                }
-
                 TokenBucket bucket = m_throttleCategories[category];
 
                 // Don't send this packet if there is already a packet waiting in the queue
@@ -496,9 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns>True if any packets were sent, otherwise false</returns>
         public bool DequeueOutgoing()
         {
-            if (m_deliverPackets == false) return false;
-
-            OutgoingPacket packet = null;
+            OutgoingPacket packet;
             OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
             TokenBucket bucket;
             bool packetSent = false;
@@ -530,49 +520,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // No dequeued packet waiting to be sent, try to pull one off
                     // this queue
                     queue = m_packetOutboxes[i];
-                    if (queue != null)
+                    if (queue.Dequeue(out packet))
                     {
-                        bool success = false;
-                        try
+                        // A packet was pulled off the queue. See if we have
+                        // enough tokens in the bucket to send it out
+                        if (bucket.RemoveTokens(packet.Buffer.DataLength))
                         {
-                            success = queue.Dequeue(out packet);
-                        }
-                        catch
-                        {
-                            m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
-                        }
-                        if (success)
-                        {
-                            // A packet was pulled off the queue. See if we have
-                            // enough tokens in the bucket to send it out
-                            if (bucket.RemoveTokens(packet.Buffer.DataLength))
-                            {
-                                // Send the packet
-                                m_udpServer.SendPacketFinal(packet);
-                                packetSent = true;
-                            }
-                            else
-                            {
-                                // Save the dequeued packet for the next iteration
-                                m_nextPackets[i] = packet;
-                            }
-
-                            // If the queue is empty after this dequeue, fire the queue
-                            // empty callback now so it has a chance to fill before we 
-                            // get back here
-                            if (queue.Count == 0)
-                                emptyCategories |= CategoryToFlag(i);
+                            // Send the packet
+                            m_udpServer.SendPacketFinal(packet);
+                            packetSent = true;
                         }
                         else
                         {
-                            // No packets in this queue. Fire the queue empty callback
-                            // if it has not been called recently
-                            emptyCategories |= CategoryToFlag(i);
+                            // Save the dequeued packet for the next iteration
+                            m_nextPackets[i] = packet;
                         }
+
+                        // If the queue is empty after this dequeue, fire the queue
+                        // empty callback now so it has a chance to fill before we 
+                        // get back here
+                        if (queue.Count == 0)
+                            emptyCategories |= CategoryToFlag(i);
                     }
                     else
                     {
-                        m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
+                        // No packets in this queue. Fire the queue empty callback
+                        // if it has not been called recently
                         emptyCategories |= CategoryToFlag(i);
                     }
                 }
@@ -730,4 +703,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
     }
-}
+}

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

@@ -270,7 +270,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 false,
                 true,
                 GetWatchdogIncomingAlarmData,
-                Watchdog.WATCHDOG_TIMEOUT_MS);
+                Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
 
             Watchdog.StartThread(
                 OutgoingPacketHandler,
@@ -279,7 +279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 false,
                 true,
                 GetWatchdogOutgoingAlarmData,
-                Watchdog.WATCHDOG_TIMEOUT_MS);
+                Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
 
             m_elapsedMSSinceLastStatReport = Environment.TickCount;
         }
@@ -1103,7 +1103,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
 
-                    client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
+                    client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                     client.OnLogout += LogoutHandler;
 
                     ((LLClientView)client).DisableFacelights = m_disableFacelights;
@@ -1138,7 +1138,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.SceneAgent.IsChildAgent)
                  client.Kick("Simulator logged you out due to connection timeout");
 
-            Util.FireAndForget(o => client.Close());
+            client.Close();
         }
 
         private void IncomingPacketHandler()
@@ -1149,7 +1149,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             while (base.IsRunning)
             {
-                m_scene.ThreadAlive(1);
                 try
                 {
                     IncomingPacket incomingPacket = null;
@@ -1192,7 +1191,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             while (base.IsRunning)
             {
-                m_scene.ThreadAlive(2);
                 try
                 {
                     m_packetSent = false;
@@ -1462,4 +1460,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
     }
-}
+}

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

@@ -100,6 +100,10 @@ namespace OpenMetaverse
                 const int SIO_UDP_CONNRESET = -1744830452;
 
                 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
+                
+                m_log.DebugFormat(
+                    "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}", 
+                    ipep.Address, ipep.Port);                
 
                 m_udpSocket = new Socket(
                     AddressFamily.InterNetwork,

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

@@ -28,7 +28,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Collections.Generic;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,13 +38,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
     public class AssetXferUploader
     {
-        // Viewer's notion of the default texture
-        private List<UUID> defaultIDs = new List<UUID> {
-                new UUID("5748decc-f629-461c-9a36-a35a221fe21f"),
-                new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"),
-                new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"),
-                new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
-                };
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
@@ -73,7 +65,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private UUID TransactionID = UUID.Zero;
         private sbyte type = 0;
         private byte wearableType = 0;
-        private byte[] m_oldData = null;
         public ulong XferID;
         private Scene m_Scene;
 
@@ -311,7 +302,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         private void DoCreateItem(uint callbackID)
         {
-            ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
 
             InventoryItemBase item = new InventoryItemBase();
@@ -332,84 +322,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             item.Flags = (uint) wearableType;
             item.CreationDate = Util.UnixTimeSinceEpoch();
 
-            m_log.DebugFormat("[XFER]: Created item {0} with asset {1}",
-                    item.ID, item.AssetID);
-
             if (m_Scene.AddInventoryItem(item))
                 ourClient.SendInventoryItemCreateUpdate(item, callbackID);
             else
                 ourClient.SendAlertMessage("Unable to create inventory item");
         }
 
-        private void ValidateAssets()
-        {
-            if (m_asset.Type == (sbyte)AssetType.Clothing ||
-                m_asset.Type == (sbyte)AssetType.Bodypart)
-            {
-                string content = System.Text.Encoding.ASCII.GetString(m_asset.Data);
-                string[] lines = content.Split(new char[] {'\n'});
-
-                List<string> validated = new List<string>();
-
-                Dictionary<int, UUID> allowed = ExtractTexturesFromOldData();
-
-                int textures = 0;
-
-                foreach (string line in lines)
-                {
-                    try
-                    {
-                        if (line.StartsWith("textures "))
-                        {
-                            textures = Convert.ToInt32(line.Substring(9));
-                            validated.Add(line);
-                        }
-                        else if (textures > 0)
-                        {
-                            string[] parts = line.Split(new char[] {' '});
-
-                            UUID tx = new UUID(parts[1]);
-                            int id = Convert.ToInt32(parts[0]);
-
-                            if (defaultIDs.Contains(tx) || tx == UUID.Zero ||
-                                (allowed.ContainsKey(id) && allowed[id] == tx))
-                            {
-                                validated.Add(parts[0] + " " + tx.ToString());
-                            }
-                            else
-                            {
-                                int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx);
-                                int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy);
-
-                                if ((perms & full) != full)
-                                {
-                                    m_log.ErrorFormat("[ASSET UPLOADER]: REJECTED update with texture {0} from {1} because they do not own the texture", tx, ourClient.AgentId);
-                                    validated.Add(parts[0] + " " + UUID.Zero.ToString());
-                                }
-                                else
-                                {
-                                    validated.Add(line);
-                                }
-                            }
-                            textures--;
-                        }
-                        else
-                        {
-                            validated.Add(line);
-                        }
-                    }
-                    catch
-                    {
-                        // If it's malformed, skip it
-                    }
-                }
-
-                string final = String.Join("\n", validated.ToArray());
-
-                m_asset.Data = System.Text.Encoding.ASCII.GetBytes(final);
-            }
-        }
-
         /// <summary>
         /// Get the asset data uploaded in this transfer.
         /// </summary>
@@ -418,55 +336,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         {
             if (m_finished)
             {
-                ValidateAssets();
                 return m_asset;
             }
 
             return null;
         }
-
-        public void SetOldData(byte[] d)
-        {
-            m_oldData = d;
-        }
-
-        private Dictionary<int,UUID> ExtractTexturesFromOldData()
-        {
-            Dictionary<int,UUID> result = new Dictionary<int,UUID>();
-            if (m_oldData == null)
-                return result;
-
-            string content = System.Text.Encoding.ASCII.GetString(m_oldData);
-            string[] lines = content.Split(new char[] {'\n'});
-
-            int textures = 0;
-
-            foreach (string line in lines)
-            {
-                try
-                {
-                    if (line.StartsWith("textures "))
-                    {
-                        textures = Convert.ToInt32(line.Substring(9));
-                    }
-                    else if (textures > 0)
-                    {
-                        string[] parts = line.Split(new char[] {' '});
-
-                        UUID tx = new UUID(parts[1]);
-                        int id = Convert.ToInt32(parts[0]);
-                        result[id] = tx;
-                        textures--;
-                    }
-                }
-                catch
-                {
-                    // If it's malformed, skip it
-                }
-            }
-
-            return result;
-        }
     }
 }
-

OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

@@ -257,71 +257,58 @@ namespace Flotsam.RegionModules.AssetCache
 
         private void UpdateFileCache(string key, AssetBase asset)
         {
-            // TODO: Spawn this off to some seperate thread to do the actual writing
-            if (asset != null)
+            string filename = GetFileName(asset.ID);
+
+            try
             {
-                string filename = GetFileName(key);
-
-                try
+                // If the file is already cached just update access time.
+                if (File.Exists(filename))
                 {
-                    // 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)
                     {
-                        // We don't really want to know about sharing
-                        // violations here. If the file is locked, then
-                        // the other thread has updated the time for us.
-                        try
-                        {
-                            lock (m_CurrentlyWriting)
-                            {
-                                if (!m_CurrentlyWriting.Contains(filename))
-                                    File.SetLastAccessTime(filename, DateTime.Now);
-                            }
-                        }
-                        catch
-                        {
-                        }
-                    } else {
-
-                        // Once we start writing, make sure we flag that we're writing
-                        // that object to the cache so that we don't try to write the 
-                        // same file multiple times.
-                        lock (m_CurrentlyWriting)
-                        {
-#if WAIT_ON_INPROGRESS_REQUESTS
-                            if (m_CurrentlyWriting.ContainsKey(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
-                            }
-
-#else
-                            if (m_CurrentlyWriting.Contains(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename);
-                            }
-#endif
-
-                        }
-
-                        Util.FireAndForget(
-                            delegate { WriteFileCache(filename, asset); });
+                        if (!m_CurrentlyWriting.Contains(filename))
+                            File.SetLastAccessTime(filename, DateTime.Now);
                     }
                 }
-                catch (Exception e)
+                else
                 {
-                    m_log.ErrorFormat(
-                        "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
-                        asset.ID, e.Message, e.StackTrace);
+                    // Once we start writing, make sure we flag that we're writing
+                    // that object to the cache so that we don't try to write the
+                    // same file multiple times.
+                    lock (m_CurrentlyWriting)
+                    {
+#if WAIT_ON_INPROGRESS_REQUESTS
+                        if (m_CurrentlyWriting.ContainsKey(filename))
+                        {
+                            return;
+                        }
+                        else
+                        {
+                            m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
+                       }
+
+#else
+                        if (m_CurrentlyWriting.Contains(filename))
+                        {
+                            return;
+                        }
+                        else
+                        {
+                            m_CurrentlyWriting.Add(filename);
+                        }
+#endif
+                    }
+
+                    Util.FireAndForget(
+                        delegate { WriteFileCache(filename, asset); });
                 }
             }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                    asset.ID, e.Message, e.StackTrace);
+            }
         }
 
         public void Cache(AssetBase asset)

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

@@ -28,7 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -39,7 +38,6 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
-using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -169,40 +167,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
 //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name);
 
-            XmlDocument doc = new XmlDocument();
-            string stateData = String.Empty;
-
-            IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
-            if (attServ != null)
-            {
-                m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
-                stateData = attServ.Get(sp.UUID.ToString());
-                if (stateData != String.Empty)
-                {
-                    try
-                    {
-                        doc.LoadXml(stateData);
-                    }
-                    catch { }
-                }
-            }
-
-            Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
-
-            XmlNodeList nodes = doc.GetElementsByTagName("Attachment");
-            if (nodes.Count > 0)
-            {
-                foreach (XmlNode n in nodes)
-                {
-                    XmlElement elem = (XmlElement)n;
-                    string itemID = elem.GetAttribute("ItemID");
-                    string xml = elem.InnerXml;
-
-                    itemData[new UUID(itemID)] = xml;
-                }
-            }
-
-
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
@@ -222,22 +186,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 try
                 {
-                    string xmlData;
-                    XmlDocument d = null;
-                    UUID asset;
-                    if (itemData.TryGetValue(attach.ItemID, out xmlData))
-                    {
-                        d = new XmlDocument();
-                        d.LoadXml(xmlData);
-                        m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
-                    }
-
                     // If we're an NPC then skip all the item checks and manipulations since we don't have an
                     // inventory right now.
                     if (sp.PresenceType == PresenceType.Npc)
-                        RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p, null);
+                        RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p);
                     else
-                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p, true, d);
+                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p);
                 }
                 catch (Exception e)
                 {
@@ -257,16 +211,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             lock (sp.AttachmentsSyncLock)
             {
-                foreach (SceneObjectGroup grp in sp.GetAttachments())
+                foreach (SceneObjectGroup so in sp.GetAttachments())
                 {
-                    grp.Scene.DeleteSceneObject(grp, false);
+                    // We can only remove the script instances from the script engine after we've retrieved their xml state
+                    // when we update the attachment item.
+                    m_scene.DeleteSceneObject(so, false, false);
     
                     if (saveChanged || saveAllScripted)
                     {
-                        grp.IsAttachment = false;
-                        grp.AbsolutePosition = grp.RootPart.AttachedPos;
-                        UpdateKnownItem(sp, grp, saveAllScripted);
+                        so.IsAttachment = false;
+                        so.AbsolutePosition = so.RootPart.AttachedPos;
+                        UpdateKnownItem(sp, so, saveAllScripted);
                     }
+
+                    so.RemoveScriptInstances(true);
                 }
     
                 sp.ClearAttachments();
@@ -290,13 +248,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             sp.ClearAttachments();
         }
         
-        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData)
+        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent)
         {
             lock (sp.AttachmentsSyncLock)
             {
 //                m_log.DebugFormat(
 //                    "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
 //                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
+
+                if (group.GetSittingAvatarsCount() != 0)
+                {
+//                    m_log.WarnFormat(
+//                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
+//                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
+    
+                    return false;
+                }
     
                 if (sp.GetAttachments(attachmentPt).Contains(group))
                 {
@@ -336,51 +303,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     attachPos = Vector3.Zero;
                 }
     
-                if (useAttachData)
-                {
-                    group.RootPart.RotationOffset = group.RootPart.AttachRotation;
-                    attachPos = group.RootPart.AttachOffset;
-                    if (attachmentPt == 0)
-                    {
-                        attachmentPt = group.RootPart.AttachPoint;
-                        if (attachmentPt == 0)
-                        {
-                            attachmentPt = (uint)AttachmentPoint.LeftHand;
-                            attachPos = Vector3.Zero;
-                        }
-                    }
-                    else if (group.RootPart.AttachPoint != attachmentPt)
-                    {
-                        attachPos = Vector3.Zero;
-                    }
-                }
                 group.AttachmentPoint = attachmentPt;
                 group.AbsolutePosition = attachPos;
 
-                // We also don't want to do any of the inventory operations for an NPC.
                 if (sp.PresenceType != PresenceType.Npc)
-                {
-                    // Remove any previous attachments
-                    List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
-    
-                    // At the moment we can only deal with a single attachment
-                    if (attachments.Count != 0)
-                    {
-                        if (attachments[0].FromItemID != UUID.Zero)
-                            DetachSingleAttachmentToInvInternal(sp, attachments[0]);
-                        else
-                            m_log.WarnFormat(
-                                "[ATTACHMENTS MODULE]: When detaching existing attachment {0} {1} at point {2} to make way for {3} {4} for {5}, couldn't find the associated item ID to adjust inventory attachment record!",
-                                attachments[0].Name, attachments[0].LocalId, attachmentPt, group.Name, group.LocalId, sp.Name);
-                    }
-    
-                    // Add the new attachment to inventory if we don't already have it.
-                    UUID newAttachmentItemID = group.FromItemID;
-                    if (newAttachmentItemID == UUID.Zero)
-                        newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp, group).ID;
-        
-                    ShowAttachInUserInventory(sp, attachmentPt, newAttachmentItemID, group);
-                }
+                    UpdateUserInventoryWithAttachment(sp, group, attachmentPt);
     
                 AttachToAgent(sp, group, attachmentPt, attachPos, silent);
             }
@@ -388,12 +315,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             return true;
         }
 
-        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
-		{
-			return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, true, null);
-		}
+        private void UpdateUserInventoryWithAttachment(IScenePresence sp, SceneObjectGroup group, uint attachmentPt)
+        {
+            // Remove any previous attachments
+            List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
 
-		public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
+            // At the moment we can only deal with a single attachment
+            if (attachments.Count != 0)
+            {
+                if (attachments[0].FromItemID != UUID.Zero)
+                    DetachSingleAttachmentToInvInternal(sp, attachments[0]);
+                else
+                    m_log.WarnFormat(
+                        "[ATTACHMENTS MODULE]: When detaching existing attachment {0} {1} at point {2} to make way for {3} {4} for {5}, couldn't find the associated item ID to adjust inventory attachment record!",
+                        attachments[0].Name, attachments[0].LocalId, attachmentPt, group.Name, group.LocalId, sp.Name);
+            }
+
+            // Add the new attachment to inventory if we don't already have it.
+            UUID newAttachmentItemID = group.FromItemID;
+            if (newAttachmentItemID == UUID.Zero)
+                newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp, group).ID;
+
+            ShowAttachInUserInventory(sp, attachmentPt, newAttachmentItemID, group);
+        }
+
+        public SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
         {
             if (!Enabled)
                 return null;
@@ -432,7 +378,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return null;
             }
 
-            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, doc);
+            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt);
         }
 
         public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)
@@ -491,7 +437,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.AttachedAvatar = UUID.Zero;
                 rootPart.SetParentLocalId(0);
                 so.ClearPartAttachmentData();
-                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
+                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
                 so.HasGroupChanged = true;
                 rootPart.Rezzed = DateTime.Now;
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
@@ -581,6 +527,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// </remarks>
         /// <param name="sp"></param>
         /// <param name="grp"></param>
+        /// <param name="saveAllScripted"></param>
         private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp, bool saveAllScripted)
         {
             // Saving attachments for NPCs messes them up for the real owner!
@@ -620,10 +567,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                     m_scene.InventoryService.UpdateItem(item);
 
-                    // this gets called when the agent logs off!
+                    // If the name of the object has been changed whilst attached then we want to update the inventory
+                    // item in the viewer.
                     if (sp.ControllingClient != null)
                         sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
+
                 grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
 //            else
@@ -721,79 +670,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             //                "[ATTACHMENTS MODULE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2}",
             //                grp.Name, grp.LocalId, remoteClient.Name);
 
-//            Vector3 inventoryStoredPosition = new Vector3
-//                   (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
-//                         ? (float)Constants.RegionSize - 6
-//                         : grp.AbsolutePosition.X)
-//                    ,
-//                    (grp.AbsolutePosition.Y > (int)Constants.RegionSize)
-//                        ? (float)Constants.RegionSize - 6
-//                        : grp.AbsolutePosition.Y,
-//                    grp.AbsolutePosition.Z);
-//
-//            Vector3 originalPosition = grp.AbsolutePosition;
-//
-//            grp.AbsolutePosition = inventoryStoredPosition;
-
-            // If we're being called from a script, then trying to serialize that same script's state will not complete
-            // in any reasonable time period.  Therefore, we'll avoid it.  The worst that can happen is that if
-            // the client/server crashes rather than logging out normally, the attachment's scripts will resume
-            // without state on relog.  Arguably, this is what we want anyway.
-            string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, false);
-
-//            grp.AbsolutePosition = originalPosition;
-
-            AssetBase asset = m_scene.CreateAsset(
-                grp.GetPartName(grp.LocalId),
-                grp.GetPartDescription(grp.LocalId),
-                (sbyte)AssetType.Object,
-                Utils.StringToBytes(sceneObjectXml),
-                sp.UUID);
-
-            m_scene.AssetService.Store(asset);
-
-            InventoryItemBase item = new InventoryItemBase();
-            item.CreatorId = grp.RootPart.CreatorID.ToString();
-            item.CreatorData = grp.RootPart.CreatorData;
-            item.Owner = sp.UUID;
-            item.ID = UUID.Random();
-            item.AssetID = asset.FullID;
-            item.Description = asset.Description;
-            item.Name = asset.Name;
-            item.AssetType = asset.Type;
-            item.InvType = (int)InventoryType.Object;
-
-            InventoryFolderBase folder = m_scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
-            if (folder != null)
-                item.Folder = folder.ID;
-            else // oopsies
-                item.Folder = UUID.Zero;
-
-            // Nix the special bits we used to use for slam and the folded perms
-            uint allowablePermissionsMask = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move);
-
-            if ((sp.UUID != grp.RootPart.OwnerID) && m_scene.Permissions.PropagatePermissions())
-            {
-                item.BasePermissions = grp.RootPart.BaseMask & grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-                item.CurrentPermissions = grp.RootPart.BaseMask & grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-                item.NextPermissions = grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-                item.EveryOnePermissions = grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-                item.GroupPermissions = grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-            }
-            else
-            {
-                item.BasePermissions = grp.RootPart.BaseMask & allowablePermissionsMask;
-                item.CurrentPermissions = grp.RootPart.OwnerMask & allowablePermissionsMask;
-                item.NextPermissions = grp.RootPart.NextOwnerMask & allowablePermissionsMask;
-                item.EveryOnePermissions = grp.RootPart.EveryoneMask & allowablePermissionsMask;
-                item.GroupPermissions = grp.RootPart.GroupMask & allowablePermissionsMask;
-            }
-            item.CreationDate = Util.UnixTimeSinceEpoch();
+            InventoryItemBase newItem
+                = m_invAccessModule.CopyToInventory(
+                    DeRezAction.TakeCopy,
+                    m_scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object).ID,
+                    new List<SceneObjectGroup> { grp },
+                    sp.ControllingClient, true)[0];
 
             // sets itemID so client can show item as 'attached' in inventory
-            grp.FromItemID = item.ID;
+            grp.FromItemID = newItem.ID;
 
-            return item;
+            return newItem;
         }
 
         private void DetachSingleAttachmentToInvInternal(IScenePresence sp, SceneObjectGroup so)
@@ -802,7 +689,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             m_scene.EventManager.TriggerOnAttach(so.LocalId, so.FromItemID, UUID.Zero);
             sp.RemoveAttachment(so);
-            m_scene.DeleteSceneObject(so, false);
+
+            // We can only remove the script instances from the script engine after we've retrieved their xml state
+            // when we update the attachment item.
+            m_scene.DeleteSceneObject(so, false, false);
 
             // Prepare sog for storage
             so.AttachedAvatar = UUID.Zero;
@@ -811,10 +701,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             so.AbsolutePosition = so.RootPart.AttachedPos;
 
             UpdateKnownItem(sp, so, true);
+            so.RemoveScriptInstances(true);
         }
 
-        protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
-            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc)
+        private SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
+            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt)
         {
             if (m_invAccessModule == null)
                 return null;
@@ -832,22 +723,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
                         false, false, sp.UUID, true);
 
-//                m_log.DebugFormat(
-//                    "[ATTACHMENTS MODULE]: Retrieved single object {0} for attachment to {1} on point {2}",
-//                    objatt.Name, remoteClient.Name, AttachmentPt);
-                
                 if (objatt != null)
                 {
+//                    m_log.DebugFormat(
+//                        "[ATTACHMENTS MODULE]: Rezzed single object {0} for attachment to {1} on point {2} in {3}",
+//                        objatt.Name, sp.Name, attachmentPt, m_scene.Name);
+
                     // HasGroupChanged is being set from within RezObject.  Ideally it would be set by the caller.
                     objatt.HasGroupChanged = false;
                     bool tainted = false;
                     if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)
                         tainted = true;
 
+                    // FIXME: Detect whether it's really likely for AttachObject to throw an exception in the normal
+                    // course of events.  If not, then it's probably not worth trying to recover the situation
+                    // since this is more likely to trigger further exceptions and confuse later debugging.  If
+                    // exceptions can be thrown in expected error conditions (not NREs) then make this consistent
+                    // since other normal error conditions will simply return false instead.
                     // This will throw if the attachment fails
                     try
                     {
-                        AttachObject(sp, objatt, attachmentPt, false, false);
+                        AttachObject(sp, objatt, attachmentPt, false);
                     }
                     catch (Exception e)
                     {
@@ -860,16 +756,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         m_scene.DeleteSceneObject(objatt, false);
                         return null;
                     }
-                    
+
                     if (tainted)
                         objatt.HasGroupChanged = true;
 
-                    if (doc != null)
-                    {
-                        objatt.LoadScriptState(doc);
-                        objatt.ResetOwnerChangeFlag();
-                    }
-
                     // Fire after attach, so we don't get messy perms dialogs
                     // 4 == AttachedRez
                     objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
@@ -887,7 +777,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         itemID, sp.Name, attachmentPt);
                 }
             }
-            
+
             return null;
         }
 
@@ -920,7 +810,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             item = m_scene.InventoryService.GetItem(item);
             bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
             if (changed && m_scene.AvatarFactory != null)
+            {
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Queueing appearance save for {0}, attachment {1} point {2} in ShowAttachInUserInventory()",
+//                    sp.Name, att.Name, AttachmentPt);
+
                 m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
+            }
         }
 
         #endregion
@@ -1001,7 +897,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 AttachmentPt &= 0x7f;
 
                 // Calls attach with a Zero position
-                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true))
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
                 {
 //                    m_log.Debug(
 //                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId

OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

@@ -31,6 +31,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Timers;
+using System.Xml;
 using Timer=System.Timers.Timer;
 using Nini.Config;
 using NUnit.Framework;
@@ -41,10 +42,12 @@ using OpenSim.Region.CoreModules.Avatar.Attachments;
 using OpenSim.Region.CoreModules.Framework;
 using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.Framework.InventoryAccess;
-using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.Scripting.WorldComm;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.ScriptEngine.XEngine;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
@@ -57,6 +60,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
     [TestFixture]
     public class AttachmentsModuleTests : OpenSimTestCase
     {
+        private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
+        private OSChatMessage m_osChatMessageReceived;
+
         [TestFixtureSetUp]
         public void FixtureInit()
         {
@@ -72,16 +78,74 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
         }
 
-        private Scene CreateDefaultTestScene()
+        private void OnChatFromWorld(object sender, OSChatMessage oscm)
+        {
+//            Console.WriteLine("Got chat [{0}]", oscm.Message);
+
+            m_osChatMessageReceived = oscm;
+            m_chatEvent.Set();
+        }
+
+        private Scene CreateTestScene()
         {
             IConfigSource config = new IniConfigSource();
+            List<object> modules = new List<object>();
+
+            AddCommonConfig(config, modules);
+
+            Scene scene
+                = new SceneHelpers().SetupScene(
+                    "attachments-test-scene", TestHelpers.ParseTail(999), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, modules.ToArray());
+
+            return scene;
+        }
+
+        private Scene CreateScriptingEnabledTestScene()
+        {
+            IConfigSource config = new IniConfigSource();
+            List<object> modules = new List<object>();
+
+            AddCommonConfig(config, modules);
+            AddScriptingConfig(config, modules);
+
+            Scene scene
+                = new SceneHelpers().SetupScene(
+                    "attachments-test-scene", TestHelpers.ParseTail(999), 1000, 1000, config);
+            SceneHelpers.SetupSceneModules(scene, config, modules.ToArray());
+
+            scene.StartScripts();
+
+            return scene;
+        }
+
+        private void AddCommonConfig(IConfigSource config, List<object> modules)
+        {
             config.AddConfig("Modules");
             config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
 
-            Scene scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(scene, config, new AttachmentsModule(), new BasicInventoryAccessModule());
+            modules.Add(new AttachmentsModule());
+            modules.Add(new BasicInventoryAccessModule());
+        }
 
-            return scene;
+        private void AddScriptingConfig(IConfigSource config, List<object> modules)
+        {
+            IConfig startupConfig = config.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = config.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+            xEngineConfig.Set("StartDelay", "0");
+
+            // These tests will not run with AppDomainLoading = true, at least on mono.  For unknown reasons, the call
+            // to AssemblyResolver.OnAssemblyResolve fails.
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            modules.Add(new XEngine());
+
+            // Necessary to stop serialization complaining
+            // FIXME: Stop this being necessary if at all possible
+//            modules.Add(new WorldCommModule());
         }
 
         /// <summary>
@@ -116,15 +180,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
-            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1.PrincipalID);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
 
             string attName = "att";
 
-            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID).ParentGroup;
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID);
 
-            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false);
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false);
 
             // Check status on scene presence
             Assert.That(sp.HasAttachments(), Is.True);
@@ -149,16 +213,48 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object);
             Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID));
 
+            Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
 //            TestHelpers.DisableLogging();
         }
 
+        /// <summary>
+        /// Test that we do not attempt to attach an in-world object that someone else is sitting on.
+        /// </summary>
         [Test]
-        public void TestAddAttachmentFromInventory()
+        public void TestAddSatOnAttachmentFromGround()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            Scene scene = CreateTestScene();
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
+
+            string attName = "att";
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID);
+
+            UserAccount ua2 = UserAccountHelpers.CreateUserWithInventory(scene, 0x2);
+            ScenePresence sp2 = SceneHelpers.AddScenePresence(scene, ua2);
+
+            // Put avatar within 10m of the prim so that sit doesn't fail.
+            sp2.AbsolutePosition = new Vector3(0, 0, 0);
+            sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero);
+
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false);
+
+            Assert.That(sp.HasAttachments(), Is.False);
+            Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void TestRezAttachmentFromInventory()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1.PrincipalID);
 
@@ -181,6 +277,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // Check appearance status
             Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1));
             Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
+
+            Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+        }
+
+        /// <summary>
+        /// Test specific conditions associated with rezzing a scripted attachment from inventory.
+        /// </summary>
+        [Test]
+        public void TestRezScriptedAttachmentFromInventory()
+        {
+            TestHelpers.InMethod();
+
+            Scene scene = CreateTestScene();
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1.PrincipalID);
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
+            TaskInventoryHelpers.AddScript(scene, so.RootPart);
+            InventoryItemBase userItem = UserInventoryHelpers.AddInventoryItem(scene, so, 0x100, 0x1000);
+
+            scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+
+            // TODO: Need to have a test that checks the script is actually started but this involves a lot more
+            // plumbing of the script engine and either pausing for events or more infrastructure to turn off various
+            // script engine delays/asychronicity that isn't helpful in an automated regression testing context.
+            SceneObjectGroup attSo = scene.GetSceneObjectGroup(so.Name);
+            Assert.That(attSo.ContainsScripts(), Is.True);
         }
 
         [Test]
@@ -189,7 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1.PrincipalID);
 
@@ -219,9 +342,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         public void TestDetachAttachmentToInventory()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1.PrincipalID);
 
@@ -239,6 +361,47 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Check item status
             Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo(0));
+
+            Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(0));
+        }
+
+        /// <summary>
+        /// Test specific conditions associated with detaching a scripted attachment from inventory.
+        /// </summary>
+        [Test]
+        public void TestDetachScriptedAttachmentToInventory()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            Scene scene = CreateScriptingEnabledTestScene();
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10);
+            TaskInventoryHelpers.AddScript(scene, so.RootPart);
+            InventoryItemBase userItem = UserInventoryHelpers.AddInventoryItem(scene, so, 0x100, 0x1000);
+
+            // FIXME: Right now, we have to do a tricksy chat listen to make sure we know when the script is running.
+            // In the future, we need to be able to do this programatically more predicably.
+            scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+
+            SceneObjectGroup soRezzed
+                = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+
+            // Wait for chat to signal rezzed script has been started.
+            m_chatEvent.WaitOne(60000);
+
+            scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, soRezzed);
+
+            InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem);
+            AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString());
+
+            XmlDocument soXml = new XmlDocument();
+            soXml.LoadXml(Encoding.UTF8.GetString(asset.Data));
+
+            XmlNodeList scriptStateNodes = soXml.GetElementsByTagName("ScriptState");
+            Assert.That(scriptStateNodes.Count, Is.EqualTo(1));
         }
 
         /// <summary>
@@ -250,7 +413,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             InventoryItemBase attItem = CreateAttachmentItem(scene, ua1.PrincipalID, "att", 0x10, 0x20);
 
@@ -273,7 +436,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             InventoryItemBase attItem = CreateAttachmentItem(scene, ua1.PrincipalID, "att", 0x10, 0x20);
 
@@ -300,6 +463,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(retreivedAttachments[0].ItemID, Is.EqualTo(attItem.ID));
             Assert.That(retreivedAttachments[0].AssetID, Is.EqualTo(attItem.AssetID));
             Assert.That(presence.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
+
+            Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
         }
 
         [Test]
@@ -307,7 +472,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         {
             TestHelpers.InMethod();
 
-            Scene scene = CreateDefaultTestScene();
+            Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             InventoryItemBase attItem = CreateAttachmentItem(scene, ua1.PrincipalID, "att", 0x10, 0x20);
 
@@ -399,6 +564,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name));
             Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest));
 
+            Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
             // Check attachments have been removed from sceneA
             ScenePresence afterTeleportSceneASp = sceneA.GetScenePresence(ua1.PrincipalID);
 
@@ -410,6 +577,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // This is the actual attachment, which should no longer exist
             List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments();
             Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0));
+
+            Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0));
         }
 
         // I'm commenting this test because scene setup NEEDS InventoryService to 
@@ -435,4 +604,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //            Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
 //        }
     }
-}
+}

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

@@ -566,17 +566,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         private void Client_OnRequestWearables(IClientAPI client)
         {
-            Util.FireAndForget(delegate(object x)
-            {
-                Thread.Sleep(4000);
-
-                // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
-                ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
-                if (sp != null)
-                    client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
-                else
-                    m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
-            });
+            // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+            if (sp != null)
+                client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
+            else
+                m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
         }
         
         /// <summary>

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

@@ -49,8 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         private int m_shoutdistance = 100;
         private int m_whisperdistance = 10;
         private List<Scene> m_scenes = new List<Scene>();
-        private List<string> FreezeCache = new List<string>();
-        private string m_adminPrefix = "";
+
         internal object m_syncy = new object();
 
         internal IConfig m_config;
@@ -77,7 +76,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
             m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
             m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
-            m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
         }
 
         public virtual void AddRegion(Scene scene)
@@ -173,15 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
-            {
-                if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
-                    c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
-            }
-            else
-            {
-                DeliverChatToAvatars(ChatSourceType.Agent, c);
-            }
+            DeliverChatToAvatars(ChatSourceType.Agent, c);
         }
 
         public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -195,11 +185,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
         {
             string fromName = c.From;
-            string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
+            UUID targetID = c.TargetUUID;
             string message = c.Message;
             IScene scene = c.Scene;
-            UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.RegionLocX * Constants.RegionSize,
                                             scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
@@ -219,11 +208,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromPos = avatar.AbsolutePosition;
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
-                if (avatar.GodLevel >= 200)
-                {
-                    fromNamePrefix = m_adminPrefix;
-                }
-                destination = UUID.Zero; // Avatars cant "SayTo"
+
                 break;
 
             case ChatSourceType.Object:
@@ -237,39 +222,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}, targetID {5}",
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-            
+
             foreach (Scene s in m_scenes)
             {
-                // This should use ForEachClient, but clients don't have a position.
-                // If camera is moved into client, then camera position can be used
-                // MT: No, it can't, as chat is heard from the avatar position, not
-                // the camera position.
-                s.ForEachRootScenePresence(
-                    delegate(ScenePresence presence)
-                    {
-                        if (destination != UUID.Zero && presence.UUID != destination)
-                            return;
-                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
-                        if (Presencecheck != null)
+                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)
                         {
-                            // This will pass all chat from objects. Not
-                            // perfect, but it will do. For now. Better
-                            // than the prior behavior of muting all
-                            // objects on a parcel with access restrictions
-                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
-                            {
-                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
-                                    receiverIDs.Add(presence.UUID);
-                            }
+                            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)
+                    {
+                        if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, ChatTypeEnum.Say, message, sourceType, true))
+                                receiverIDs.Add(presence.UUID);
                     }
-                );
+                }
             }
-            
+
             (scene as Scene).EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
@@ -309,29 +293,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
+
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
             
-            if (c.Scene != null)
-            {
-                ((Scene)c.Scene).ForEachRootClient
-                (
-                    delegate(IClientAPI client)
-                    {
-                        // don't forward SayOwner chat from objects to
-                        // non-owner agents
-                        if ((c.Type == ChatTypeEnum.Owner) &&
-                            (null != c.SenderObject) &&
-                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                            return;
-                        
-                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
-                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-                        receiverIDs.Add(client.AgentId);
-                    }
-                );
-                (c.Scene as Scene).EventManager.TriggerOnChatToClients(
-                    fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
-             }
+            ((Scene)c.Scene).ForEachRootClient(
+                delegate(IClientAPI client)
+                {   
+                    // don't forward SayOwner chat from objects to
+                    // non-owner agents
+                    if ((c.Type == ChatTypeEnum.Owner) &&
+                        (null != c.SenderObject) &&
+                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                        return;
+                    
+                    client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
+                                            (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                    receiverIDs.Add(client.AgentId);
+                });
+            
+            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
         }
 
         /// <summary>
@@ -349,11 +330,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// precondition</returns>
         protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
                                                   UUID fromAgentID, string fromName, ChatTypeEnum type,
-                                                  string message, ChatSourceType src)
+                                                  string message, ChatSourceType src, bool ignoreDistance)
         {
-            // don't send llRegionSay to child agents. Send normal chat because you
-            // can't talk across sim borders if it's not done
-            if (type == ChatTypeEnum.Broadcast && presence.IsChildAgent) return false;
+            // don't send stuff to child agents
+            if (presence.IsChildAgent) return false;
 
             Vector3 fromRegionPos = fromPos + regionPos;
             Vector3 toRegionPos = presence.AbsolutePosition +
@@ -361,12 +341,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
 
             int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
-            
-            if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
-                type == ChatTypeEnum.Say && dis > m_saydistance ||
-                type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+
+            if (!ignoreDistance)
             {
-                return false;
+                if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
+                    type == ChatTypeEnum.Say && dis > m_saydistance ||
+                    type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+                {
+                    return false;
+                }
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
@@ -375,35 +358,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             
             return true;
         }
-
-        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
-        public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
-        {
-            System.Threading.Timer Timer;
-            if (flags == 0)
-            {
-                FreezeCache.Add(target.ToString());
-                System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
-                Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
-                Timers.Add(target, Timer);
-            }
-            else
-            {
-                FreezeCache.Remove(target.ToString());
-                Timers.TryGetValue(target, out Timer);
-                Timers.Remove(target);
-                Timer.Dispose();
-            }
-        }
-
-        private void OnEndParcelFrozen(object avatar)
-        {
-            UUID target = (UUID)avatar;
-            FreezeCache.Remove(target.ToString());
-            System.Threading.Timer Timer;
-            Timers.TryGetValue(target, out Timer);
-            Timers.Remove(target);
-            Timer.Dispose();
-        }
     }
 }

OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs

@@ -216,4 +216,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             return result;
         }
     }
-}
+}

OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs

@@ -31,40 +31,16 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using System;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.IO;
-using System.Web;
-using System.Xml;
-using log4net;
-using Mono.Addins;
-using OpenMetaverse.Messages.Linden;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
     public class GodsModule : IRegionModule, IGodsModule
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         /// <summary>Special UUID for actions that apply to all agents</summary>
         private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
         protected Scene m_scene;
         protected IDialogModule m_dialogModule;
-
-        protected Dictionary<UUID, string> m_capsDict =
-                new Dictionary<UUID, string>();
         
         public void Initialise(Scene scene, IConfigSource source)
         {
@@ -72,10 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IGodsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
-            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
-            m_scene.EventManager.OnClientClosed += OnClientClosed;
-            scene.EventManager.OnIncomingInstantMessage +=
-                    OnIncomingInstantMessage;
         }
         
         public void PostInitialise() {}
@@ -95,54 +67,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
         
-        private void OnClientClosed(UUID agentID, Scene scene)
-        {
-            m_capsDict.Remove(agentID);
-        }
-
-        private void OnRegisterCaps(UUID agentID, Caps caps)
-        {
-            string uri = "/CAPS/" + UUID.Random();
-            m_capsDict[agentID] = uri;
-
-            caps.RegisterHandler("UntrustedSimulatorMessage",
-                    new RestStreamHandler("POST", uri,
-                    HandleUntrustedSimulatorMessage));
-        }
-
-        private string HandleUntrustedSimulatorMessage(string request,
-                string path, string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
-        {
-            OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-
-            string message = osd["message"].AsString();
-
-            if (message == "GodKickUser")
-            {
-                OSDMap body = (OSDMap)osd["body"];
-                OSDArray userInfo = (OSDArray)body["UserInfo"];
-                OSDMap userData = (OSDMap)userInfo[0];
-
-                UUID agentID = userData["AgentID"].AsUUID();
-                UUID godID = userData["GodID"].AsUUID();
-                UUID godSessionID = userData["GodSessionID"].AsUUID();
-                uint kickFlags = userData["KickFlags"].AsUInteger();
-                string reason = userData["Reason"].AsString();
-
-                ScenePresence god = m_scene.GetScenePresence(godID);
-                if (god == null || god.ControllingClient.SessionId != godSessionID)
-                    return String.Empty;
-
-                KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
-            }
-            else
-            {
-                m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
-            }
-            return String.Empty;
-        }
-
         public void RequestGodlikePowers(
             UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
         {
@@ -191,85 +115,69 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         /// <param name="reason">The message to send to the user after it's been turned into a field</param>
         public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
         {
-            if (!m_scene.Permissions.IsGod(godID))
-                return;
-
+            UUID kickUserID = ALL_AGENTS;
+            
             ScenePresence sp = m_scene.GetScenePresence(agentID);
 
-            if (sp == null && agentID != ALL_AGENTS)
+            if (sp != null || agentID == kickUserID)
             {
-                IMessageTransferModule transferModule =
-                        m_scene.RequestModuleInterface<IMessageTransferModule>();
-                if (transferModule != null)
+                if (m_scene.Permissions.IsGod(godID))
                 {
-                    m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
-                    transferModule.SendInstantMessage(new GridInstantMessage(
-                            m_scene, godID, "God", agentID, (byte)250, false,
-                            Utils.BytesToString(reason), UUID.Zero, true,
-                            new Vector3(), new byte[] {(byte)kickflags}),
-                            delegate(bool success) {} );
-                }
-                return;
-            }
+                    if (kickflags == 0)
+                    {
+                        if (agentID == kickUserID)
+                        {
+                            string reasonStr = Utils.BytesToString(reason);
 
-            switch (kickflags)
-            {
-            case 0:
-                if (sp != null)
-                {
-                    KickPresence(sp, Utils.BytesToString(reason));
-                }
-                else if (agentID == ALL_AGENTS)
-                {
-                    m_scene.ForEachRootScenePresence(
-                            delegate(ScenePresence p)
-                            {
-                                if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
-                                    KickPresence(p, Utils.BytesToString(reason));
-                            }
-                    );
-                }
-                break;
-            case 1:
-                if (sp != null)
-                {
-                    sp.AllowMovement = false;
-                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                    m_dialogModule.SendAlertToUser(godID, "User Frozen");
-                }
-                break;
-            case 2:
-                if (sp != null)
-                {
-                    sp.AllowMovement = true;
-                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                    m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
-                }
-                break;
-            default:
-                break;
-            }
-        }
+                            m_scene.ForEachClient(
+                                delegate(IClientAPI controller)
+                                {
+                                    if (controller.AgentId != godID)
+                                        controller.Kick(reasonStr);
+                                }
+                            );
 
-        private void KickPresence(ScenePresence sp, string reason)
-        {
-            if (sp.IsChildAgent)
-                return;
-            sp.ControllingClient.Kick(reason);
-            sp.Scene.IncomingCloseAgent(sp.UUID);
-        }
+                            // This is a bit crude. It seems the client will be null before it actually stops the thread
+                            // The thread will kill itself eventually :/
+                            // Is there another way to make sure *all* clients get this 'inter region' message?
+                            m_scene.ForEachRootClient(
+                                delegate(IClientAPI client)
+                                {
+                                    if (client.AgentId != godID)
+                                    {
+                                        client.Close();
+                                    }
+                                }
+                            );
+                        }
+                        else
+                        {
+                            m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
 
-        private void OnIncomingInstantMessage(GridInstantMessage msg)
-        {
-            if (msg.dialog == (uint)250) // Nonlocal kick
-            {
-                UUID agentID = new UUID(msg.toAgentID);
-                string reason = msg.message;
-                UUID godID = new UUID(msg.fromAgentID);
-                uint kickMode = (uint)msg.binaryBucket[0];
-
-                KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
+                            sp.ControllingClient.Kick(Utils.BytesToString(reason));
+                            sp.ControllingClient.Close();
+                        }
+                    }
+                    
+                    if (kickflags == 1)
+                    {
+                        sp.AllowMovement = false;
+                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                        m_dialogModule.SendAlertToUser(godID, "User Frozen");
+                    }
+                    
+                    if (kickflags == 2)
+                    {
+                        sp.AllowMovement = true;
+                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                        m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+                    }
+                }
+                else
+                {
+                    m_dialogModule.SendAlertToUser(godID, "Kick request denied");
+                }
             }
         }
     }
-}
+}

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

@@ -27,7 +27,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -43,10 +42,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Timer m_logTimer = new Timer(10000);
-        private List<GridInstantMessage> m_logData = new List<GridInstantMessage>();
-        private string m_restUrl;
-
         /// <value>
         /// Is this module enabled?
         /// </value>
@@ -66,12 +61,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule", "InstantMessageModule") !=
                         "InstantMessageModule")
                     return;
-                m_restUrl = config.Configs["Messaging"].GetString("LogURL", String.Empty);
             }
             
             m_enabled = true;
-            m_logTimer.AutoReset = false;
-            m_logTimer.Elapsed += LogTimerElapsed;
         }
 
         public void AddRegion(Scene scene)
@@ -156,9 +148,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             byte dialog = im.dialog;
 
-            if (client != null && dialog == (byte)InstantMessageDialog.MessageFromAgent)
-                LogInstantMesssage(im);
-
             if (dialog != (byte)InstantMessageDialog.MessageFromAgent
                 && dialog != (byte)InstantMessageDialog.StartTyping
                 && dialog != (byte)InstantMessageDialog.StopTyping
@@ -168,32 +157,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
-            //DateTime dt = DateTime.UtcNow;
-
-            // Ticks from UtcNow, but make it look like local. Evil, huh?
-            //dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
-
-            //try
-            //{
-            //    // Convert that to the PST timezone
-            //    TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
-            //    dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
-            //}
-            //catch
-            //{
-            //    //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp.");
-            //}
-
-            //// And make it look local again to fool the unix time util
-            //dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
-
-            // If client is null, this message comes from storage and IS offline
-            if (client != null)
-                im.offline = 0;
-
-            if (im.offline == 0)
-                im.timestamp = (uint)Util.UnixTimeSinceEpoch();
-
             if (m_TransferModule != null)
             {
                 if (client != null)
@@ -237,35 +200,5 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             //
             OnInstantMessage(null, msg);
         }
-
-        private void LogInstantMesssage(GridInstantMessage im)
-        {
-            if (m_logData.Count < 20)
-            {
-                // Restart the log write timer
-                m_logTimer.Stop();
-            }
-            if (!m_logTimer.Enabled)
-                m_logTimer.Start();
-
-            lock (m_logData)
-            {
-                m_logData.Add(im);
-            }
-        }
-
-        private void LogTimerElapsed(object source, ElapsedEventArgs e)
-        {
-            lock (m_logData)
-            {
-                if (m_restUrl != String.Empty && m_logData.Count > 0)
-                {
-                    bool success = SynchronousRestObjectRequester.MakeRequest<List<GridInstantMessage>, bool>("POST", m_restUrl + "/LogMessages/", m_logData);
-                    if (!success)
-                        m_log.ErrorFormat("[INSTANT MESSAGE]: Failed to save log data");
-                }
-                m_logData.Clear();
-            }
-        }
     }
 }

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

@@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
-        protected string m_MessageKey = String.Empty;
         protected List<Scene> m_Scenes = new List<Scene>();
         protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>();
 
@@ -68,17 +67,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public virtual void Initialise(IConfigSource config)
         {
             IConfig cnf = config.Configs["Messaging"];
-            if (cnf != null)
+            if (cnf != null && cnf.GetString(
+                    "MessageTransferModule", "MessageTransferModule") !=
+                    "MessageTransferModule")
             {
-                if (cnf.GetString("MessageTransferModule",
-                        "MessageTransferModule") != "MessageTransferModule")
-                {
-                    return;
-                }
-
-                m_MessageKey = cnf.GetString("MessageKey", String.Empty);
+                m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
+                return;
             }
-            m_log.Debug("[MESSAGE TRANSFER]: Module enabled");
+
             m_Enabled = true;
         }
 
@@ -141,13 +137,15 @@ 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}", user.Name, toAgentID);
+                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", sp.Name, toAgentID);
+
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -159,13 +157,15 @@ 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}", user.Name, toAgentID);
+                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", sp.Name, toAgentID);
+
                     sp.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
@@ -174,10 +174,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
-//            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
-            SendGridInstantMessageViaXMLRPC(im, result);
+            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
 
-            return;
+            SendGridInstantMessageViaXMLRPC(im, result);
         }
 
         private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
@@ -248,19 +247,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id")
                         && requestData.ContainsKey("binary_bucket"))
                 {
-                    if (m_MessageKey != String.Empty)
-                    {
-                        XmlRpcResponse error_resp = new XmlRpcResponse();
-                        Hashtable error_respdata = new Hashtable();
-                        error_respdata["success"] = "FALSE";
-                        error_resp.Value = error_respdata;
-
-                        if (!requestData.Contains("message_key"))
-                            return error_resp;
-                        if (m_MessageKey != (string)requestData["message_key"])
-                            return error_resp;
-                    }
-
                     // Do the easy way of validating the UUIDs
                     UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID);
                     UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
@@ -437,37 +423,24 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return resp;
         }
 
-        private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
+        /// <summary>
+        /// delegate for sending a grid instant message asynchronously
+        /// </summary>
+        public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID);
 
-        private class GIM {
-            public GridInstantMessage im;
-            public MessageResultNotification result;
-        };
-
-        private Queue<GIM> pendingInstantMessages = new Queue<GIM>();
-        private int numInstantMessageThreads = 0;
-
-        private void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
+        protected virtual void GridInstantMessageCompleted(IAsyncResult iar)
         {
-            lock (pendingInstantMessages) {
-                if (numInstantMessageThreads >= 4) {
-                    GIM gim = new GIM();
-                    gim.im = im;
-                    gim.result = result;
-                    pendingInstantMessages.Enqueue(gim);
-                } else {
-                    ++ numInstantMessageThreads;
-                    //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: ++numInstantMessageThreads={0}", numInstantMessageThreads);
-                    GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsyncMain;
-                    d.BeginInvoke(im, result, GridInstantMessageCompleted, d);
-                }
-            }
+            GridInstantMessageDelegate icon =
+                    (GridInstantMessageDelegate)iar.AsyncState;
+            icon.EndInvoke(iar);
         }
 
-        private void GridInstantMessageCompleted(IAsyncResult iar)
+
+        protected virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
         {
-            GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState;
-            d.EndInvoke(iar);
+            GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync;
+
+            d.BeginInvoke(im, result, UUID.Zero, GridInstantMessageCompleted, d);
         }
 
         /// <summary>
@@ -482,31 +455,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
         /// regionhandle tried
         /// </param>
-        private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
+        protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
         {
-            GIM gim;
-            do {
-                try {
-                    SendGridInstantMessageViaXMLRPCAsync(im, result, UUID.Zero);
-                } catch (Exception e) {
-                    m_log.Error("[SendGridInstantMessageViaXMLRPC]: exception " + e.Message);
-                }
-                lock (pendingInstantMessages) {
-                    if (pendingInstantMessages.Count > 0) {
-                        gim = pendingInstantMessages.Dequeue();
-                        im = gim.im;
-                        result = gim.result;
-                    } else {
-                        gim = null;
-                        -- numInstantMessageThreads;
-                        //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: --numInstantMessageThreads={0}", numInstantMessageThreads);
-                    }
-                }
-            } while (gim != null);
-        }
-        private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
-        {
-
             UUID toAgentID = new UUID(im.toAgentID);
 
             PresenceInfo upd = null;
@@ -573,7 +523,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             if (upd != null)
             {
-                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero,
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
                     upd.RegionID);
                 if (reginfo != null)
                 {
@@ -722,8 +672,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             gim["position_z"] = msg.Position.Z.ToString();
             gim["region_id"] = msg.RegionID.ToString();
             gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None);
-            if (m_MessageKey != String.Empty)
-                gim["message_key"] = m_MessageKey;
             return gim;
         }
 

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

@@ -171,11 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void RetrieveInstantMessages(IClientAPI client)
         {
-            if (m_RestURL == String.Empty)
-            {
-                return;
-            }
-            else
+            if (m_RestURL != "")
             {
                 m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId);
 
@@ -183,25 +179,22 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>(
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
-                if (msglist != null)
+                if (msglist == null)
+                    m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
+
+                foreach (GridInstantMessage im in msglist)
                 {
-                    foreach (GridInstantMessage im in msglist)
-                    {
-                        // client.SendInstantMessage(im);
+                    // client.SendInstantMessage(im);
 
-                        // Send through scene event manager so all modules get a chance
-                        // to look at this message before it gets delivered.
-                        //
-                        // Needed for proper state management for stored group
-                        // invitations
-                        //
-
-                        im.offline = 1;
-
-                        Scene s = FindScene(client.AgentId);
-                        if (s != null)
-                            s.EventManager.TriggerIncomingInstantMessage(im);
-                    }
+                    // Send through scene event manager so all modules get a chance
+                    // to look at this message before it gets delivered.
+                    //
+                    // Needed for proper state management for stored group
+                    // invitations
+                    //
+                    Scene s = FindScene(client.AgentId);
+                    if (s != null)
+                        s.EventManager.TriggerIncomingInstantMessage(im);
                 }
             }
         }
@@ -212,19 +205,24 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
                 im.dialog != (byte)InstantMessageDialog.GroupNotice &&
                 im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
-                im.dialog != (byte)InstantMessageDialog.InventoryOffered &&
-                im.dialog != (byte)InstantMessageDialog.TaskInventoryOffered)
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
             {
                 return;
             }
 
+            if (!m_ForwardOfflineGroupMessages)
+            {
+                if (im.dialog == (byte)InstantMessageDialog.GroupNotice ||
+                    im.dialog != (byte)InstantMessageDialog.GroupInvitation)
+                    return;
+            }
+
             Scene scene = FindScene(new UUID(im.fromAgentID));
             if (scene == null)
                 scene = m_SceneList[0];
 
             bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
-                    "POST", m_RestURL+"/SaveMessage/?scope=" +
-                    scene.RegionInfo.ScopeID.ToString(), im);
+                    "POST", m_RestURL+"/SaveMessage/", im);
 
             if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
             {

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

@@ -635,4 +635,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_assetsLoaded = true;            
         }                 
     }
-}
+}

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

@@ -175,8 +175,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
             
-                UUID recipientID = new UUID(im.toAgentID);
-                ScenePresence user = scene.GetScenePresence(recipientID);
+                UUID receipientID = new UUID(im.toAgentID);
+                ScenePresence user = scene.GetScenePresence(receipientID);
                 UUID copyID;
 
                 // First byte is the asset type
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                             folderID, new UUID(im.toAgentID));
                     
                     InventoryFolderBase folderCopy 
-                        = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
+                        = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero);
                     
                     if (folderCopy == null)
                     {
@@ -244,8 +244,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.imSessionID = itemID.Guid;
                 }
 
-                im.offline = 0;
-
                 // Send the IM to the recipient. The item is already
                 // in their inventory, so it will not be lost if
                 // they are offline.
@@ -265,42 +263,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
-                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
             {
-                UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
-                IInventoryService invService = scene.InventoryService;
-
-                // Special case: folder redirect.
-                // RLV uses this
-                if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
-                {
-                    InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId);
-                    folder = invService.GetFolder(folder);
-
-                    if (folder != null)
-                    {
-                        if (im.binaryBucket.Length >= 16)
-                        {
-                            UUID destFolderID = new UUID(im.binaryBucket, 0);
-                            if (destFolderID != UUID.Zero)
-                            {
-                                InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId);
-                                destFolder = invService.GetFolder(destFolder);
-                                if (destFolder != null)
-                                {
-                                    if (folder.ParentID != destFolder.ID)
-                                    {
-                                        folder.ParentID = destFolder.ID;
-                                        invService.MoveFolder(folder);
-                                        client.SendBulkUpdateInventory(folder);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
                 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 
                 if (user != null) // Local
@@ -310,11 +274,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 else
                 {
                     if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
+                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {
+
+                            // justincc - FIXME: Comment out for now.  This code was added in commit db91044 Mon Aug 22 2011
+                            // and is apparently supposed to fix bulk inventory updates after accepting items.  But
+                            // instead it appears to cause two copies of an accepted folder for the receiving user in
+                            // at least some cases.  Folder/item update is already done when the offer is made (see code above)
+
+//                            // Send BulkUpdateInventory
+//                            IInventoryService invService = scene.InventoryService;
+//                            UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
+//
+//                            InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
+//                            folder = invService.GetFolder(folder);
+//
+//                            ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
+//
+//                            // If the user has left the scene by the time the message comes back then we can't send
+//                            // them the update.
+//                            if (fromUser != null)
+//                                fromUser.ControllingClient.SendBulkUpdateInventory(folder);
+                        });
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined ||
-                     im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)
+            else if (
+                im.dialog == (byte)InstantMessageDialog.InventoryDeclined
+                || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined)
             {
                 // Here, the recipient is local and we can assume that the
                 // inventory is loaded. Courtesy of the above bulk update,
@@ -350,7 +335,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     {
                         folder.ParentID = trashFolder.ID;
                         invService.MoveFolder(folder);
-                        client.SendBulkUpdateInventory(folder);
                     }
                 }
                 
@@ -451,113 +435,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         ///
         /// </summary>
         /// <param name="msg"></param>
-        private void OnGridInstantMessage(GridInstantMessage im)
+        private void OnGridInstantMessage(GridInstantMessage msg)
         {
             // Check if this is ours to handle
             //
-            Scene scene = FindClientScene(new UUID(im.toAgentID));
+            Scene scene = FindClientScene(new UUID(msg.toAgentID));
 
             if (scene == null)
                 return;
 
             // Find agent to deliver to
             //
-            ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
-            if (user == null)
-                return;
+            ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID));
 
-            // This requires a little bit of processing because we have to make the
-            // new item visible in the recipient's inventory here
-            //
-            if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
-            {
-                if (im.binaryBucket.Length < 17) // Invalid
-                    return;
-            
-                UUID recipientID = new UUID(im.toAgentID);
+            // Just forward to local handling
+            OnInstantMessage(user.ControllingClient, msg);
 
-                // First byte is the asset type
-                AssetType assetType = (AssetType)im.binaryBucket[0];
-                
-                if (AssetType.Folder == assetType)
-                {
-                    UUID folderID = new UUID(im.binaryBucket, 1);
-
-                    InventoryFolderBase given =
-                            new InventoryFolderBase(folderID, recipientID);
-                    InventoryFolderBase folder =
-                            scene.InventoryService.GetFolder(given);
-
-                    if (folder != null)
-                        user.ControllingClient.SendBulkUpdateInventory(folder);
-                }
-                else
-                {
-                    UUID itemID = new UUID(im.binaryBucket, 1);
-
-                    InventoryItemBase given =
-                            new InventoryItemBase(itemID, recipientID);
-                    InventoryItemBase item =
-                            scene.InventoryService.GetItem(given);
-
-                    if (item != null)
-                    {
-                        user.ControllingClient.SendBulkUpdateInventory(item);
-                    }
-                }
-                user.ControllingClient.SendInstantMessage(im);
-            }
-            if (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
-            {
-                if (im.binaryBucket.Length < 1) // Invalid
-                    return;
-            
-                UUID recipientID = new UUID(im.toAgentID);
-
-                // Bucket is the asset type
-                AssetType assetType = (AssetType)im.binaryBucket[0];
-                
-                if (AssetType.Folder == assetType)
-                {
-                    UUID folderID = new UUID(im.imSessionID);
-
-                    InventoryFolderBase given =
-                            new InventoryFolderBase(folderID, recipientID);
-                    InventoryFolderBase folder =
-                            scene.InventoryService.GetFolder(given);
-
-                    if (folder != null)
-                        user.ControllingClient.SendBulkUpdateInventory(folder);
-                }
-                else
-                {
-                    UUID itemID = new UUID(im.imSessionID);
-
-                    InventoryItemBase given =
-                            new InventoryItemBase(itemID, recipientID);
-                    InventoryItemBase item =
-                            scene.InventoryService.GetItem(given);
-
-                    if (item != null)
-                    {
-                        user.ControllingClient.SendBulkUpdateInventory(item);
-                    }
-                }
-
-                // Fix up binary bucket since this may be 17 chars long here
-                Byte[] bucket = new Byte[1];
-                bucket[0] = im.binaryBucket[0];
-                im.binaryBucket = bucket;
-
-                user.ControllingClient.SendInstantMessage(im);
-            }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
-                     im.dialog == (byte) InstantMessageDialog.InventoryDeclined ||
-                     im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined ||
-                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
-            {
-                user.ControllingClient.SendInstantMessage(im);
-            }
         }
     }
 }

OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs

@@ -161,29 +161,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     scene.RegionInfo.RegionHandle,
                     (uint)presence.AbsolutePosition.X,
                     (uint)presence.AbsolutePosition.Y,
-                    (uint)presence.AbsolutePosition.Z + 2);
+                    (uint)Math.Ceiling(presence.AbsolutePosition.Z));
 
-            m_log.DebugFormat("[LURE]: TP invite with message {0}", message);
-
-            GridInstantMessage m;
-
-            if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid)))
-            {
-                m = new GridInstantMessage(scene, client.AgentId,
-                        client.FirstName+" "+client.LastName, targetid,
-                        (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
-                        message, dest, false, presence.AbsolutePosition,
-                        new Byte[0]);
-            }
-            else
-            {
-                m = new GridInstantMessage(scene, client.AgentId,
-                        client.FirstName+" "+client.LastName, targetid,
-                        (byte)InstantMessageDialog.RequestTeleport, false,
-                        message, dest, false, presence.AbsolutePosition,
-                        new Byte[0]);
-            }
+            m_log.DebugFormat("TP invite with message {0}", message);
 
+            GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
+                    client.FirstName+" "+client.LastName, targetid,
+                    (byte)InstantMessageDialog.RequestTeleport, false,
+                    message, dest, false, presence.AbsolutePosition,
+                    new Byte[0]);
+                    
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
@@ -218,8 +205,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
         {
             // Forward remote teleport requests
             //
-            if (msg.dialog != (byte)InstantMessageDialog.RequestTeleport &&
-                msg.dialog != (byte)InstantMessageDialog.GodLikeRequestTeleport)
+            if (msg.dialog != 22)
                 return;
 
             if (m_TransferModule != null)

OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs

@@ -102,8 +102,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void CreateCaps(UUID agentId)
         {
-            int flags = m_scene.GetUserFlags(agentId);
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
                 return;
 
             String capsObjectPath = GetCapsPath(agentId);

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

@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TriggerTeleportHome;
+            client.OnTeleportHomeRequest += TeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
         }
 
@@ -269,7 +269,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             sp.ControllingClient.SendTeleportStart(teleportFlags);
 
             sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
-            sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
             sp.Velocity = Vector3.Zero;
             sp.Teleport(position);
 
@@ -430,7 +429,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
             // it's actually doing a lot of work.
             IPEndPoint endPoint = finalDestination.ExternalEndPoint;
-            if (endPoint == null || endPoint.Address == null)
+
+            if (endPoint.Address == null)
             {
                 sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down");
                 m_entityTransferStateMachine.ResetFromTransit(sp.UUID);
@@ -781,12 +781,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Teleport Home
 
-        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)
-        {
-            TeleportHome(id, client);
-        }
-
-        public virtual bool TeleportHome(UUID id, IClientAPI client)
+        public virtual void TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -796,18 +791,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (uinfo != null)
             {
-                if (uinfo.HomeRegionID == UUID.Zero)
-                {
-                    // can't find the Home region: Tell viewer and abort
-                    client.SendTeleportFailed("You don't have a home position set.");
-                    return false;
-                }
                 GridRegion regionInfo = Scene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                 if (regionInfo == null)
                 {
                     // can't find the Home region: Tell viewer and abort
                     client.SendTeleportFailed("Your home region could not be found.");
-                    return false;
+                    return;
                 }
                 
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
@@ -820,11 +809,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             else
             {
-                // can't find the Home region: Tell viewer and abort
-                client.SendTeleportFailed("Your home region could not be found.");
-                return false;
+                m_log.ErrorFormat(
+                    "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}.  Cannot send home.",
+                    client.Name, client.AgentId);
             }
-            return true;
         }
 
         #endregion
@@ -832,10 +820,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Agent Crossings
 
-        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos)
+        public bool Cross(ScenePresence agent, bool isFlying)
         {
-            version = String.Empty;
-            newpos = new Vector3(pos.X, pos.Y, pos.Z);
+            Scene scene = agent.Scene;
+            Vector3 pos = agent.AbsolutePosition;
+            Vector3 newpos = new Vector3(pos.X, pos.Y, pos.Z);
             uint neighbourx = scene.RegionInfo.RegionLocX;
             uint neighboury = scene.RegionInfo.RegionLocY;
             const float boundaryDistance = 1.7f;
@@ -856,12 +845,52 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    neighboury--;
-                    newpos.Y = Constants.RegionSize - enterDistance;
+                    Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
+                    if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
+                    {
+                        neighboury--;
+                        newpos.Y = Constants.RegionSize - enterDistance;
+                    }
+                    else
+                    {
+                        agent.IsInTransit = true;
+
+                        neighboury = b.TriggerRegionY;
+                        neighbourx = b.TriggerRegionX;
+
+                        Vector3 newposition = pos;
+                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
+                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
+                        agent.ControllingClient.SendAgentAlertMessage(
+                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
+                        InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
+                        return true;
+                    }
+                }
+
+                Border ba = scene.GetCrossedBorder(pos + westCross, Cardinals.W);
+                if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
+                {
+                    neighbourx--;
+                    newpos.X = Constants.RegionSize - enterDistance;
+                }
+                else
+                {
+                    agent.IsInTransit = true;
+
+                    neighboury = ba.TriggerRegionY;
+                    neighbourx = ba.TriggerRegionX;
+
+                    Vector3 newposition = pos;
+                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
+                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
+                    agent.ControllingClient.SendAgentAlertMessage(
+                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
+                    InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
+
+                    return true;
                 }
 
-                neighbourx--;
-                newpos.X = Constants.RegionSize - enterDistance;
             }
             else if (scene.TestBorderCross(pos + eastCross, Cardinals.E))
             {
@@ -871,8 +900,26 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    neighboury--;
-                    newpos.Y = Constants.RegionSize - enterDistance;
+                    Border ba = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
+                    if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
+                    {
+                        neighboury--;
+                        newpos.Y = Constants.RegionSize - enterDistance;
+                    }
+                    else
+                    {
+                        agent.IsInTransit = true;
+
+                        neighboury = ba.TriggerRegionY;
+                        neighbourx = ba.TriggerRegionX;
+                        Vector3 newposition = pos;
+                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
+                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
+                        agent.ControllingClient.SendAgentAlertMessage(
+                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
+                        InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
+                        return true;
+                    }
                 }
                 else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
                 {
@@ -884,8 +931,25 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
             {
                 Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                neighboury--;
-                newpos.Y = Constants.RegionSize - enterDistance;
+                if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
+                {
+                    neighboury--;
+                    newpos.Y = Constants.RegionSize - enterDistance;
+                }
+                else
+                {
+                    agent.IsInTransit = true;
+
+                    neighboury = b.TriggerRegionY;
+                    neighbourx = b.TriggerRegionX;
+                    Vector3 newposition = pos;
+                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
+                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
+                    agent.ControllingClient.SendAgentAlertMessage(
+                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
+                    InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
+                    return true;
+                }
             }
             else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
             {
@@ -919,22 +983,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             */
 
-            xDest = neighbourx;
-            yDest = neighboury;
+            ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
 
             int x = (int)(neighbourx * Constants.RegionSize), y = (int)(neighboury * Constants.RegionSize);
 
-            ulong neighbourHandle = Utils.UIntsToLong((uint)x, (uint)y);
-
             ExpiringCache<ulong, DateTime> r;
             DateTime banUntil;
 
-            if (m_bannedRegions.TryGetValue(agentID, out r))
+            if (m_bannedRegions.TryGetValue(agent.ControllingClient.AgentId, out r))
             {
                 if (r.TryGetValue(neighbourHandle, out banUntil))
                 {
                     if (DateTime.Now < banUntil)
-                        return null;
+                        return false;
                     r.Remove(neighbourHandle);
                 }
             }
@@ -946,43 +1007,28 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
             string reason;
-            if (!scene.SimulationService.QueryAccess(neighbourRegion, agentID, newpos, out version, out reason))
+            string version;
+            if (!scene.SimulationService.QueryAccess(neighbourRegion, agent.ControllingClient.AgentId, newpos, out version, out reason))
             {
+                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 if (r == null)
                 {
                     r = new ExpiringCache<ulong, DateTime>();
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
 
-                    m_bannedRegions.Add(agentID, r, TimeSpan.FromSeconds(45));
+                    m_bannedRegions.Add(agent.ControllingClient.AgentId, r, TimeSpan.FromSeconds(45));
                 }
                 else
                 {
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
                 }
-                return null;
-            }
-
-            return neighbourRegion;
-        }
-
-        public bool Cross(ScenePresence agent, bool isFlying)
-        {
-            uint x;
-            uint y;
-            Vector3 newpos;
-            string version;
-
-            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos);
-            if (neighbourRegion == null)
-            {
-                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 return false;
             }
 
             agent.IsInTransit = true;
 
             CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
-            d.BeginInvoke(agent, newpos, x, y, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
+            d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
 
             return true;
         }
@@ -1039,11 +1085,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             icon.EndInvoke(iar);
         }
 
+        public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
+
         /// <summary>
         /// This Closes child agents on neighbouring regions
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        public ScenePresence CrossAgentToNewRegionAsync(
+        protected ScenePresence CrossAgentToNewRegionAsync(
             ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion,
             bool isFlying, string version)
         {
@@ -1250,14 +1298,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Id0 = currentAgentCircuit.Id0;
             }
 
-            IPEndPoint external = region.ExternalEndPoint;
-            if (external != null)
-            {
-                InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-                d.BeginInvoke(sp, agent, region, external, true,
+            InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+            d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
                           InformClientOfNeighbourCompleted,
                           d);
-            }
         }
         #endregion
 
@@ -1838,28 +1882,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Utils.LongToUInts(newRegionHandle, out x, out y);
             GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
-            if (destination != null)
+            if (destination == null || !CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
             {
-                if (CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
-                    return; // we did it
+                m_log.InfoFormat("[ENTITY TRANSFER MODULE] cross region transfer failed for object {0}",grp.UUID);
+
+                // We are going to move the object back to the old position so long as the old position
+                // is in the region
+                oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z,1.0f,4096.0f);
+
+                grp.RootPart.GroupPosition = oldGroupPosition;
+
+                // Need to turn off the physics flags, otherwise the object will continue to attempt to
+                // move out of the region creating an infinite loop of failed attempts to cross
+                grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
+
+                grp.ScheduleGroupForFullUpdate();
             }
-
-            // no one or failed lets go back and tell physics to go on
-            oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X, 0.5f, (float)Constants.RegionSize - 0.5f);
-            oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
-            oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z, 0.5f, 4096.0f);
-
-            grp.AbsolutePosition = oldGroupPosition;
-            grp.Velocity = Vector3.Zero;
-
-            if (grp.RootPart.PhysActor != null)
-                grp.RootPart.PhysActor.CrossingFailure();
-
-            grp.ScheduleGroupForFullUpdate();
         }
 
 
-
         /// <summary>
         /// Move the given scene object into a new region
         /// </summary>
@@ -1916,15 +1959,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     {
                         PhysicsActor pa = grp.RootPart.PhysActor;
                         if (pa != null)
-                        {
                             pa.CrossingFailure();
-                            if (grp.RootPart.KeyframeMotion != null)
-                            {
-                                grp.RootPart.Velocity = Vector3.Zero;
-                                grp.RootPart.KeyframeMotion.CrossingFailure();
-                                grp.SendGroupRootTerseUpdate();
-                            }
-                        }
                     }
 
                     m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
@@ -2013,4 +2048,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion
 
     }
-}
+}

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

@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected override void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TriggerTeleportHome;
+            client.OnTeleportHomeRequest += TeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
             client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
         }
@@ -195,12 +195,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout);
         }
 
-        public void TriggerTeleportHome(UUID id, IClientAPI client)
-        {
-            TeleportHome(id, client);
-        }
-
-        public override bool TeleportHome(UUID id, IClientAPI client)
+        public override void TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -211,7 +206,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 // local grid user
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
-                return base.TeleportHome(id, client);
+                base.TeleportHome(id, client);
+                return;
             }
 
             // Foreign user wants to go home
@@ -221,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your information has been lost");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
-                return false;
+                return;
             }
 
             IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -231,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your home region could not be found");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
-                return false;
+                return;
             }
 
             ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -239,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Internal error");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
-                return false;
+                return;
             }
 
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
@@ -247,8 +243,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
-            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
-            return true;
+            DoTeleport(
+                sp, homeGatekeeper, finalDestination,
+                position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
         }
 
         /// <summary>

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

@@ -359,12 +359,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             foreach (SceneObjectGroup objectGroup in objlist)
             {
-                if (objectGroup.RootPart.KeyframeMotion != null)
-                    objectGroup.RootPart.KeyframeMotion.Stop();
-                objectGroup.RootPart.SetForce(Vector3.Zero);
-                objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
-                objectGroup.RootPart.KeyframeMotion = null;
-
                 Vector3 inventoryStoredPosition = new Vector3
                             (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
                                   ? 250
@@ -375,19 +369,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                  : objectGroup.AbsolutePosition.Y,
                              objectGroup.AbsolutePosition.Z);
 
-                Quaternion inventoryStoredRotation = objectGroup.GroupRotation;
                 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
 
-                // Restore attachment data after trip through the sim
-                if (objectGroup.RootPart.AttachPoint > 0)
-                {
-                    inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
-                    inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
-                }
-                objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
-
                 objectGroup.AbsolutePosition = inventoryStoredPosition;
-                objectGroup.RootPart.RotationOffset = inventoryStoredRotation;
 
                 // Make sure all bits but the ones we want are clear
                 // on take.
@@ -505,17 +489,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
-            // For the porposes of inventory, an object is modify if the prims
-            // are modify. This allows renaming an object that contains no
-            // mod items.
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
-            {
-                uint groupPerms = grp.GetEffectivePermissions(true);
-                if ((grp.RootPart.BaseMask & (uint)PermissionMask.Modify) != 0)
-                    groupPerms |= (uint)PermissionMask.Modify;
-
-                effectivePerms &= groupPerms;
-            }
+                effectivePerms &= grp.GetEffectivePermissions();
             effectivePerms |= (uint)PermissionMask.Move;
 
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
@@ -694,8 +669,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
-                        if (f != null)
-                            folder = m_Scene.InventoryService.GetFolder(f);
+                        folder = m_Scene.InventoryService.GetFolder(f);
                     }
                 }
 
@@ -725,11 +699,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
 //            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
+
             InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
             item = m_Scene.InventoryService.GetItem(item);
 
             if (item == null)
             {
+                m_log.WarnFormat(
+                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for {1} in RezObject()",
+                    itemID, remoteClient.Name);
+
                 return null;
             }
 
@@ -780,13 +759,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (e == null || attachment) // Single
             {
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-                if (!attachment)
-                {
-                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
-                    g.RootPart.AttachOffset = g.AbsolutePosition;
-                    g.RootPart.AttachRotation = g.GroupRotation;
-                    g.RootPart.Shape.State = 0;
-                }
 
                 objlist.Add(g);
                 veclist.Add(new Vector3(0, 0, 0));
@@ -816,10 +788,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 foreach (XmlNode n in groups)
                 {
                     SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
-                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
-                    g.RootPart.AttachOffset = g.AbsolutePosition;
-                    g.RootPart.AttachRotation = g.GroupRotation;
-                    g.RootPart.Shape.State = 0;
 
                     objlist.Add(g);
                     XmlElement el = (XmlElement)n;
@@ -839,35 +807,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
-            int primcount = 0;
-            foreach (SceneObjectGroup g in objlist)
-                primcount += g.PrimCount;
-
-            if (!m_Scene.Permissions.CanRezObject(
-                primcount, remoteClient.AgentId, pos)
-                && !attachment)
-            {
-                // The client operates in no fail mode. It will
-                // have already removed the item from the folder
-                // if it's no copy.
-                // Put it back if it's not an attachment
-                //
-                if (item != null)
-                {
-                    if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
-                        remoteClient.SendBulkUpdateInventory(item);
-                }
-
-                return null;
-            }
-
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
                 return null;
 
             for (int i = 0; i < objlist.Count; i++)
             {
                 group = objlist[i];
-                SceneObjectPart rootPart = group.RootPart;
 
 //                m_log.DebugFormat(
 //                    "[INVENTORY ACCESS MODULE]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
@@ -928,6 +873,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (!attachment)
                 {
+                    SceneObjectPart rootPart = group.RootPart;
+
                     if (rootPart.Shape.PCode == (byte)PCode.Prim)
                         group.ClearPartAttachmentData();
 
@@ -945,8 +892,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    remoteClient.Name);
             }
 
-            group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
-
             if (item != null)
                 DoPostRezWhenFromItem(item, attachment);
 
@@ -1025,11 +970,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     rootPart.Name = item.Name;
                     rootPart.Description = item.Description;
-                    if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
-                    {
-                        rootPart.ObjectSaleType = item.SaleType;
-                        rootPart.SalePrice = item.SalePrice;
-                    }
+                    rootPart.ObjectSaleType = item.SaleType;
+                    rootPart.SalePrice = item.SalePrice;
                 }
 
                 so.FromFolderID = item.Folder;
@@ -1039,8 +981,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    rootPart.OwnerID, item.Owner, item.CurrentPermissions);
 
                 if ((rootPart.OwnerID != item.Owner) ||
-                    (item.CurrentPermissions & 16) != 0 ||
-                    (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
+                    (item.CurrentPermissions & 16) != 0)
                 {
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
@@ -1050,43 +991,31 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         foreach (SceneObjectPart part in so.Parts)
                         {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                            {
+                                part.EveryoneMask = item.EveryOnePermissions;
+                                part.NextOwnerMask = item.NextPermissions;
+                            }
                             part.GroupMask = 0; // DO NOT propagate here
-
-                            part.LastOwnerID = part.OwnerID;
-                            part.OwnerID = item.Owner;
-                            part.Inventory.ChangeInventoryOwner(item.Owner);
                         }
     
                         so.ApplyNextOwnerPermissions();
-
-                        // In case the user has changed flags on a received item
-                        // we have to apply those changes after the slam. Else we
-                        // get a net loss of permissions
-                        foreach (SceneObjectPart part in so.Parts)
-                        {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
-                            {
-                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                    part.EveryoneMask = item.EveryOnePermissions & part.BaseMask;
-                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                                    part.NextOwnerMask = item.NextPermissions & part.BaseMask;
-                            }
-                        }
                     }
                 }
-                else
+    
+                foreach (SceneObjectPart part in so.Parts)
                 {
-                    foreach (SceneObjectPart part in so.Parts)
-                    {
-                        part.FromUserInventoryItemID = fromUserInventoryItemId;
+                    part.FromUserInventoryItemID = fromUserInventoryItemId;
 
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                            part.EveryoneMask = item.EveryOnePermissions;
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                            part.NextOwnerMask = item.NextPermissions;
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                            part.GroupMask = item.GroupPermissions;
+                    if ((part.OwnerID != item.Owner) ||
+                        (item.CurrentPermissions & 16) != 0)
+                    {
+                        part.Inventory.ChangeInventoryOwner(item.Owner);
+                        part.GroupMask = 0; // DO NOT propagate here
                     }
+
+                    part.EveryoneMask = item.EveryOnePermissions;
+                    part.NextOwnerMask = item.NextPermissions;
                 }
     
                 rootPart.TrimPermissions();
@@ -1224,4 +1153,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         #endregion
     }
-}
+}

OpenSim/Region/CoreModules/LightShare/LightShareModule.cs

@@ -170,8 +170,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnMakeRootAgent(ScenePresence presence)
         {
-            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
-                m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
+            m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
             SendProfileToClient(presence.ControllingClient);
         }
 

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

@@ -79,7 +79,6 @@
         <RegionModule id="AuthenticationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.AuthenticationServiceInConnectorModule" />
         <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" />    \
         <RegionModule id="MapImageModule" type="OpenSim.Region.CoreModules.World.LegacyMap.MapImageModule" />    \
-        <RegionModule id="Warp3DImageModule" type="OpenSim.Region.CoreModules.World.Warp3DMap.Warp3DImageModule" />    \
 
     </Extension>
 

OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs

@@ -382,10 +382,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             try
             {
                 Request = (HttpWebRequest) WebRequest.Create(Url);
-
-                //This works around some buggy HTTP Servers like Lighttpd
-                Request.ServicePoint.Expect100Continue = false;
-
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -462,36 +458,15 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
                         // continue building the string
                         sb.Append(tempString);
-                        if (sb.Length > 2048)
-                            break;
                     }
                 } while (count > 0); // any more data to read?
 
-                ResponseBody = sb.ToString().Replace("\r", "");
+                ResponseBody = sb.ToString();
             }
             catch (Exception e)
             {
-                if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError)
-                {
-                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
-                    Status = (int)webRsp.StatusCode;
-                    try
-                    {
-                        using (Stream responseStream = webRsp.GetResponseStream())
-                        {
-                            ResponseBody = responseStream.GetStreamString();
-                        }
-                    }
-                    catch
-                    {
-                        ResponseBody = webRsp.StatusDescription;
-                    }
-                }
-                else
-                {
-                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                    ResponseBody = e.Message;
-                }
+                Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                ResponseBody = e.Message;
 
                 _finished = true;
                 return;

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

@@ -41,13 +41,39 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 {
+    /// <summary>
+    /// Data describing an external URL set up by a script.
+    /// </summary>
     public class UrlData
     {
+        /// <summary>
+        /// Scene object part hosting the script
+        /// </summary>
         public UUID hostID;
+
+        /// <summary>
+        /// The item ID of the script that requested the URL.
+        /// </summary>
         public UUID itemID;
+
+        /// <summary>
+        /// The script engine that runs the script.
+        /// </summary>
         public IScriptModule engine;
+
+        /// <summary>
+        /// The generated URL.
+        /// </summary>
         public string url;
+
+        /// <summary>
+        /// The random UUID component of the generated URL.
+        /// </summary>
         public UUID urlcode;
+
+        /// <summary>
+        /// The external requests currently being processed or awaiting retrieval for this URL.
+        /// </summary>
         public Dictionary<UUID, RequestData> requests;
     }
 
@@ -61,26 +87,37 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         //public ManualResetEvent ev;
         public bool requestDone;
         public int startTime;
-        public bool responseSent;
         public string uri;
     }
 
+    /// <summary>
+    /// This module provides external URLs for in-world scripts.
+    /// </summary>
     public class UrlModule : ISharedRegionModule, IUrlModule
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Dictionary<UUID, UrlData> m_RequestMap =
-                new Dictionary<UUID, UrlData>();
+        /// <summary>
+        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the request ID
+        /// randomly generated when a request is received for this URL.
+        /// </summary>
+        /// <remarks>
+        /// Manipulation or retrieval from this dictionary must be locked on m_UrlMap to preserve consistency with
+        /// m_UrlMap
+        /// </remarks>
+        private Dictionary<UUID, UrlData> m_RequestMap = new Dictionary<UUID, UrlData>();
 
-        private Dictionary<string, UrlData> m_UrlMap =
-                new Dictionary<string, UrlData>();
+        /// <summary>
+        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the full URL
+        /// </summary>
+        private Dictionary<string, UrlData> m_UrlMap = new Dictionary<string, UrlData>();
 
         /// <summary>
         /// Maximum number of external urls that can be set up by this module.
         /// </summary>
-        private int m_TotalUrls = 5000;
+        private int m_TotalUrls = 100;
 
         private uint https_port = 0;
         private IHttpServer m_HttpServer = null;
@@ -106,10 +143,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         {
             m_ExternalHostNameForLSL = config.Configs["Network"].GetString("ExternalHostNameForLSL", System.Environment.MachineName);
             bool ssl_enabled = config.Configs["Network"].GetBoolean("https_listener",false);
+
             if (ssl_enabled)
-            {
                 https_port = (uint) config.Configs["Network"].GetInt("https_port",0);
-            }
 
             IConfig llFunctionsConfig = config.Configs["LL-Functions"];
 
@@ -170,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString();
+                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -179,10 +215,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.url = url;
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
-
+                
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString();
+                string uri = "/lslhttp/" + urlcode.ToString() + "/";
                
                 m_HttpServer.AddPollServiceHTTPHandler(
                     uri,
@@ -225,7 +261,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
-                
                 m_UrlMap[url] = urlData;
                 
                 string uri = "/lslhttps/" + urlcode.ToString() + "/";
@@ -255,15 +290,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     return;
                 }
 
-                lock (m_RequestMap)
-                {
-                    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);
+                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);
@@ -272,19 +304,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         
         public void HttpResponse(UUID request, int status, string body)
         {
-            lock (m_RequestMap)
+            lock (m_UrlMap)
             {
                 if (m_RequestMap.ContainsKey(request))
                 {
                     UrlData urlData = m_RequestMap[request];
-                    if (!urlData.requests[request].responseSent)
-                    {
-                        urlData.requests[request].responseCode = status;
-                        urlData.requests[request].responseBody = body;
-                        //urlData.requests[request].ev.Set();
-                        urlData.requests[request].requestDone = true;
-                        urlData.requests[request].responseSent = true;
-                    }
+                    urlData.requests[request].responseCode = status;
+                    urlData.requests[request].responseBody = body;
+                    //urlData.requests[request].ev.Set();
+                    urlData.requests[request].requestDone =true;
                 }
                 else
                 {
@@ -295,7 +323,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public string GetHttpHeader(UUID requestId, string header)
         {
-            lock (m_RequestMap)
+            lock (m_UrlMap)
             {
                 if (m_RequestMap.ContainsKey(requestId))
                 {
@@ -309,12 +337,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     m_log.Warn("[HttpRequestHandler] There was no http-in request with id " + requestId);
                 }
             }
+
             return String.Empty;
         }
 
         public int GetFreeUrls()
         {
-            return m_TotalUrls - m_UrlMap.Count;
+            lock (m_UrlMap)
+                return m_TotalUrls - m_UrlMap.Count;
         }
 
         public void ScriptRemoved(UUID itemID)
@@ -331,11 +361,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-                        lock (m_RequestMap)
-                        {
-                            foreach (UUID req in url.Value.requests.Keys)
-                                m_RequestMap.Remove(req);
-                        }
+                        foreach (UUID req in url.Value.requests.Keys)
+                            m_RequestMap.Remove(req);
                     }
                 }
 
@@ -356,11 +383,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-                        lock (m_RequestMap)
-                        {
-                            foreach (UUID req in url.Value.requests.Keys)
-                                m_RequestMap.Remove(req);
-                        }
+
+                        foreach (UUID req in url.Value.requests.Keys)
+                            m_RequestMap.Remove(req);
                     }
                 }
 
@@ -369,125 +394,122 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
 
-
         private void RemoveUrl(UrlData data)
         {
-            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
+            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/" + data.urlcode.ToString() + "/");
         }
 
         private Hashtable NoEvents(UUID requestID, UUID sessionID)
         {
             Hashtable response = new Hashtable();
-            UrlData url;
-            int startTime = 0;
-            lock (m_RequestMap)
+            UrlData urlData;
+
+            lock (m_UrlMap)
             {
+                // We need to return a 404 here in case the request URL was removed at exactly the same time that a
+                // request was made.  In this case, the request thread can outrace llRemoveURL() and still be polling
+                // for the request ID.
                 if (!m_RequestMap.ContainsKey(requestID))
+                {
+                    response["int_response_code"] = 404;
+                    response["str_response_string"] = "";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
                     return response;
-                url = m_RequestMap[requestID];
-                startTime = url.requests[requestID].startTime;
-            }
-
-            if (System.Environment.TickCount - startTime > 25000)
-            {
-                response["int_response_code"] = 500;
-                response["str_response_string"] = "Script timeout";
-                response["content_type"] = "text/plain";
-                response["keepalive"] = false;
-                response["reusecontext"] = false;
-
-                //remove from map
-                lock (url.requests)
-                {
-                    url.requests.Remove(requestID);
                 }
-                lock (m_RequestMap)
+
+                urlData = m_RequestMap[requestID];
+
+                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
                 {
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+    
+                    //remove from map
+                    urlData.requests.Remove(requestID);
                     m_RequestMap.Remove(requestID);
-                }
 
-                return response;
+                    return response;
+                }
             }
 
-            
             return response;
         }
 
         private bool HasEvents(UUID requestID, UUID sessionID)
         {
-            UrlData url=null;
-            
-            lock (m_RequestMap)
+            lock (m_UrlMap)
             {
+                // We return true here because an external URL request that happened at the same time as an llRemoveURL()
+                // can still make it through to HttpRequestHandler().  That will return without setting up a request
+                // when it detects that the URL has been removed.  The poller, however, will continue to ask for
+                // events for that request, so here we will signal that there are events and in GetEvents we will
+                // return a 404.
                 if (!m_RequestMap.ContainsKey(requestID))
                 {
-                    return false;
+                    return true;
                 }
-                url = m_RequestMap[requestID];
-            }
-            lock (url.requests)
-            {
-                if (!url.requests.ContainsKey(requestID))
+
+                UrlData urlData = m_RequestMap[requestID];
+
+                if (!urlData.requests.ContainsKey(requestID))
                 {
-                    return false;
+                    return true;
                 }
-                else
+
+                // Trigger return of timeout response.
+                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
                 {
-                    if (System.Environment.TickCount - url.requests[requestID].startTime > 25000)
-                    {
-                        return true;
-                    }
-                    if (url.requests[requestID].requestDone)
-                        return true;
-                    else
-                        return false;
+                    return true;
                 }
+
+                return urlData.requests[requestID].requestDone;
             }
         }
+
         private Hashtable GetEvents(UUID requestID, UUID sessionID, string request)
         {
-             UrlData url = null;
-            RequestData requestData = null;
+            Hashtable response;
 
-            lock (m_RequestMap)
+            lock (m_UrlMap)
             {
+                UrlData url = null;
+                RequestData requestData = null;
+
                 if (!m_RequestMap.ContainsKey(requestID))
-                    return NoEvents(requestID,sessionID);
-                url = m_RequestMap[requestID];
-            }
-            lock (url.requests)
-            {
-                requestData = url.requests[requestID];
-            }
-            
-            if (!requestData.requestDone)
-                return NoEvents(requestID,sessionID);
-            
-            Hashtable response = new Hashtable();
+                    return NoEvents(requestID, sessionID);
 
-            if (System.Environment.TickCount - requestData.startTime > 25000)
-            {
-                response["int_response_code"] = 500;
-                response["str_response_string"] = "Script timeout";
+                url = m_RequestMap[requestID];
+                requestData = url.requests[requestID];
+
+                if (!requestData.requestDone)
+                    return NoEvents(requestID, sessionID);
+
+                response = new Hashtable();
+
+                if (System.Environment.TickCount - requestData.startTime > 25000)
+                {
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+                    return response;
+                }
+
+                //put response
+                response["int_response_code"] = requestData.responseCode;
+                response["str_response_string"] = requestData.responseBody;
                 response["content_type"] = "text/plain";
                 response["keepalive"] = false;
                 response["reusecontext"] = false;
-                return response;
-            }
-            //put response
-            response["int_response_code"] = requestData.responseCode;
-            response["str_response_string"] = requestData.responseBody;
-            response["content_type"] = "text/plain";
-            response["keepalive"] = false;
-            response["reusecontext"] = false;
-            
-            //remove from map
-            lock (url.requests)
-            {
+
+                //remove from map
                 url.requests.Remove(requestID);
-            }
-            lock (m_RequestMap)
-            {
                 m_RequestMap.Remove(requestID);
             }
 
@@ -496,45 +518,41 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void HttpRequestHandler(UUID requestID, Hashtable request)
         {
-            lock (request)
-            {
-                string uri = request["uri"].ToString();
-                bool is_ssl = uri.Contains("lslhttps");
+            string uri = request["uri"].ToString();
+            bool is_ssl = uri.Contains("lslhttps");
 
-                try
-                {
-                    Hashtable headers = (Hashtable)request["headers"];
+            try
+            {
+                Hashtable headers = (Hashtable)request["headers"];
 
 //                    string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
 
-                    int pos1 = uri.IndexOf("/");// /lslhttp
-                    int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
-                    int pos3 = pos2 + 37; // /lslhttp/urlcode
-                    string uri_tmp = uri.Substring(0, pos3);
-                    //HTTP server code doesn't provide us with QueryStrings
-                    string pathInfo;
-                    string queryString;
-                    queryString = "";
+                int pos1 = uri.IndexOf("/");// /lslhttp
+                int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
+                int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/
+                string uri_tmp = uri.Substring(0, pos3 + 1);
+                //HTTP server code doesn't provide us with QueryStrings
+                string pathInfo;
+                string queryString;
+                queryString = "";
 
-                    pathInfo = uri.Substring(pos3);
+                pathInfo = uri.Substring(pos3);
 
-                    UrlData url = null;
-                    string urlkey;
-                    if (!is_ssl)
-                        urlkey = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
-                    //m_UrlMap[];
+                UrlData urlData = null;
+
+                lock (m_UrlMap)
+                {
+                    string url;
+
+                    if (is_ssl)
+                        url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
                     else
-                        urlkey = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
+                        url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
 
-                    if (m_UrlMap.ContainsKey(urlkey))
-                    {
-                        url = m_UrlMap[urlkey];
-                    }
-                    else
-                    {
-                        //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString());
+                    // Avoid a race - the request URL may have been released via llRequestUrl() whilst this
+                    // request was being processed.
+                    if (!m_UrlMap.TryGetValue(url, out urlData))
                         return;
-                    }
 
                     //for llGetHttpHeader support we need to store original URI here
                     //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
@@ -554,6 +572,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         string value = (string)header.Value;
                         requestData.headers.Add(key, value);
                     }
+
                     foreach (DictionaryEntry de in request)
                     {
                         if (de.Key.ToString() == "querystringkeys")
@@ -564,21 +583,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                                 if (request.ContainsKey(key))
                                 {
                                     string val = (String)request[key];
-                                    if (key != "")
-                                    {
-                                        queryString = queryString + key + "=" + val + "&";
-                                    }
-                                    else
-                                    {
-                                        queryString = queryString + val + "&";
-                                    }                                    
+                                    queryString = queryString + key + "=" + val + "&";
                                 }
                             }
+
                             if (queryString.Length > 1)
                                 queryString = queryString.Substring(0, queryString.Length - 1);
-
                         }
-
                     }
 
                     //if this machine is behind DNAT/port forwarding, currently this is being
@@ -586,34 +597,23 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     requestData.headers["x-remote-ip"] = requestData.headers["remote_addr"];
                     requestData.headers["x-path-info"] = pathInfo;
                     requestData.headers["x-query-string"] = queryString;
-                    requestData.headers["x-script-url"] = url.url;
-
-                    //requestData.ev = new ManualResetEvent(false);
-                    lock (url.requests)
-                    {
-                        url.requests.Add(requestID, requestData);
-                    }
-                    lock (m_RequestMap)
-                    {
-                        //add to request map
-                        m_RequestMap.Add(requestID, url);
-                    }
-
-                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
-
-                    //send initial response?
-//                    Hashtable response = new Hashtable();
-
-                    return;
+                    requestData.headers["x-script-url"] = urlData.url;
 
+                    urlData.requests.Add(requestID, requestData);
+                    m_RequestMap.Add(requestID, urlData);
                 }
-                catch (Exception we)
-                {
-                    //Hashtable response = new Hashtable();
-                    m_log.Warn("[HttpRequestHandler]: http-in request failed");
-                    m_log.Warn(we.Message);
-                    m_log.Warn(we.StackTrace);
-                }
+
+                urlData.engine.PostScriptEvent(
+                    urlData.itemID,
+                    "http_request",
+                    new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
+            }
+            catch (Exception we)
+            {
+                //Hashtable response = new Hashtable();
+                m_log.Warn("[HttpRequestHandler]: http-in request failed");
+                m_log.Warn(we.Message);
+                m_log.Warn(we.StackTrace);
             }
         }
 
@@ -622,4 +622,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             ScriptRemoved(itemID);
         }
     }
-}
+}

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

@@ -90,8 +90,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         // private static readonly ILog m_log =
         //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private const int DEBUG_CHANNEL = 2147483647;
-
         private ListenerManager m_listenerManager;
         private Queue m_pending;
         private Queue m_pendingQ;
@@ -310,59 +308,56 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
+        public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
         {
-            error = null;
-
-            if (channel == DEBUG_CHANNEL)
-                return true;
-
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // Send message to avatar
+                // ignore if a child agent this is restricted to inside one region
+                if (sp.IsChildAgent)
+                    return;
+
+                // Send message to the avatar.
+                // Channel zero only goes to the avatar
+                // non zero channel messages only go to the attachments
                 if (channel == 0)
                 {
-                    // Channel 0 goes to viewer ONLY
-                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false, false, target);
-                    return true;
-                }
-
-                List<SceneObjectGroup> attachments = sp.GetAttachments();
-
-                if (attachments.Count == 0)
-                    return true;
-
-                // Get uuid of attachments
-                List<UUID> targets = new List<UUID>();
-                foreach (SceneObjectGroup sog in attachments)
+                    m_scene.SimChatToAgent(target, Utils.StringToBytes(msg), pos, name, id, false);
+               }
+                else
                 {
-                    if (!sog.IsDeleted)
-                        targets.Add(sog.UUID);
+                    List<SceneObjectGroup> attachments = sp.GetAttachments();
+                    if (attachments.Count == 0)
+                        return;
+
+                    // 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));
+                    }
                 }
 
-                // 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;
+                return;
             }
 
-            SceneObjectPart part = m_scene.GetSceneObjectPart(target);
-            if (part == null) // Not even an object
-                return true; // No error
-
+            // 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!
@@ -380,7 +375,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 }
             }
 
-            return true;
+            return;
         }
 
         protected void QueueMessage(ListenerInfo li)

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

@@ -41,8 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 {
-    public class LocalGridServicesConnector :
-            ISharedRegionModule, IGridService
+    public class LocalGridServicesConnector : ISharedRegionModule, IGridService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -51,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         private IGridService m_GridService;
         private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>();
 
-        private bool m_Enabled = false;
+        private bool m_Enabled;
 
         public LocalGridServicesConnector()
         {
@@ -59,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public LocalGridServicesConnector(IConfigSource source)
         {
-            m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated");
+            m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector instantiated directly.");
             InitialiseService(source);
         }
 
@@ -84,8 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 if (name == Name)
                 {
                     InitialiseService(source);
-                    m_Enabled = true;
-                    m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled");
+                    m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
                 }
             }
         }
@@ -95,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             IConfig assetConfig = source.Configs["GridService"];
             if (assetConfig == null)
             {
-                m_log.Error("[LOCAL GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini");
                 return;
             }
 
@@ -104,7 +102,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if (serviceDll == String.Empty)
             {
-                m_log.Error("[LOCAL GRID CONNECTOR]: No LocalServiceModule named in section GridService");
+                m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: No LocalServiceModule named in section GridService");
                 return;
             }
 
@@ -115,16 +113,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             if (m_GridService == null)
             {
-                m_log.Error("[LOCAL GRID CONNECTOR]: Can't load grid service");
+                m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: Can't load grid service");
                 return;
             }
+
+            m_Enabled = true;
         }
 
         public void PostInitialise()
         {
+            // FIXME: We will still add this command even if we aren't enabled since RemoteGridServiceConnector
+            // will have instantiated us directly.
             MainConsole.Instance.Commands.AddCommand("Regions", false, "show neighbours",
                 "show neighbours",
-                "Shows the local regions' neighbours", NeighboursCommand);
+                "Shows the local regions' neighbours", HandleShowNeighboursCommand);
         }
 
         public void Close()
@@ -133,17 +135,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public void AddRegion(Scene scene)
         {
-            if (m_Enabled)
-                scene.RegisterModuleInterface<IGridService>(this);
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IGridService>(this);
 
             if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
-                m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+                m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
             else
                 m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
         }
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_LocalCache[scene.RegionInfo.RegionID].Clear();
             m_LocalCache.Remove(scene.RegionInfo.RegionID);
         }
@@ -232,7 +239,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #endregion
 
-        public void NeighboursCommand(string module, string[] cmdparams)
+        public void HandleShowNeighboursCommand(string module, string[] cmdparams)
         {
             System.Text.StringBuilder caps = new System.Text.StringBuilder();
 

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

@@ -93,8 +93,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (config == null)
                 return;
 
-            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "-1"));
-            if (refreshminutes < 0)
+            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime"));
+            if (refreshminutes <= 0)
             {
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: No refresh time given in config. Module disabled.");
                 return;
@@ -117,15 +117,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 return;
             }
 
-            if (m_refreshtime > 0)
-            {
-                m_refreshTimer.Enabled = true;
-                m_refreshTimer.AutoReset = true;
-                m_refreshTimer.Interval = m_refreshtime;
-                m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
-            }
+            m_refreshTimer.Enabled = true;
+            m_refreshTimer.AutoReset = true;
+            m_refreshTimer.Interval = m_refreshtime;
+            m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
 
-            m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
+            m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0}min and service object {1}",
                              refreshminutes, service);
 
             m_enabled = true;
@@ -250,4 +247,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             }
         }
     }
-}
+}