From 4a5979c31114272ec3f2e8742783b6918be93ad2 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 25 Jun 2010 21:09:15 +0100
Subject: [PATCH 01/96] minor: remove some mono compiler warnings

---
 .../Region/Physics/OdePlugin/ODEDynamics.cs   |  2 +-
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs   | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
index 9beeabba0a..2342bfa141 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
@@ -675,7 +675,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             m_dir.Z = vel_now.Z;        // Preserve the accumulated falling velocity
 
             d.Vector3 pos = d.BodyGetPosition(Body);
-            Vector3 accel = new Vector3(-(m_dir.X - m_lastLinearVelocityVector.X / 0.1f), -(m_dir.Y - m_lastLinearVelocityVector.Y / 0.1f), m_dir.Z - m_lastLinearVelocityVector.Z / 0.1f);
+//            Vector3 accel = new Vector3(-(m_dir.X - m_lastLinearVelocityVector.X / 0.1f), -(m_dir.Y - m_lastLinearVelocityVector.Y / 0.1f), m_dir.Z - m_lastLinearVelocityVector.Z / 0.1f);
             Vector3 posChange = new Vector3();
             posChange.X = pos.X - m_lastPositionVector.X;
             posChange.Y = pos.Y - m_lastPositionVector.Y;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0720b5ee53..3cf45019e7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1576,19 +1576,19 @@ Console.WriteLine(" JointCreateFixed");
 //Console.WriteLine("Move " +  m_primName);
                     if (!d.BodyIsEnabled (Body))  d.BodyEnable (Body); // KF add 161009
                     // NON-'VEHICLES' are dealt with here
-                    if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
-                    {
-                        d.Vector3 avel2 = d.BodyGetAngularVel(Body);
-                        /*
-                        if (m_angularlock.X == 1)
-                            avel2.X = 0;
-                        if (m_angularlock.Y == 1)
-                            avel2.Y = 0;
-                        if (m_angularlock.Z == 1)
-                            avel2.Z = 0;
-                        d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
-                         */
-                    }
+//                    if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
+//                    {
+//                        d.Vector3 avel2 = d.BodyGetAngularVel(Body);
+//                        /*
+//                        if (m_angularlock.X == 1)
+//                            avel2.X = 0;
+//                        if (m_angularlock.Y == 1)
+//                            avel2.Y = 0;
+//                        if (m_angularlock.Z == 1)
+//                            avel2.Z = 0;
+//                        d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
+//                         */
+//                    }
                     //float PID_P = 900.0f;
 
                     float m_mass = CalculateMass();

From d399bd3eb7de6bab531087a1956f30457c3285ff Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 25 Jun 2010 21:18:52 +0100
Subject: [PATCH 02/96] minor: fix spelling mistake interupt -> interrupt in
 migrations

This is for  mantis 4783
---
 OpenSim/Data/Migration.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 4f113a2f49..c177097ebd 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -67,7 +67,6 @@ namespace OpenSim.Data
     /// really want is the assembly of your database class.
     ///
     /// </summary>
-
     public class Migration
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -173,8 +172,6 @@ namespace OpenSim.Data
             ExecuteScript(_conn, script);
         }
 
-
-
         public void Update()
         {
             InitMigrationsTable();
@@ -186,8 +183,8 @@ namespace OpenSim.Data
                 return;
 
             // to prevent people from killing long migrations.
-            m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]);
-            m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!");
+            m_log.InfoFormat("[MIGRATIONS]: Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]);
+            m_log.Info("[MIGRATIONS]: NOTE - this may take a while, don't interrupt this process!");
 
             foreach (KeyValuePair<int, string[]> kvp in migrations)
             {
@@ -206,7 +203,7 @@ namespace OpenSim.Data
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message.Replace("\n", " "));
+                    m_log.DebugFormat("[MIGRATIONS]: Cmd was {0}", e.Message.Replace("\n", " "));
                     m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.");
                     ExecuteScript("ROLLBACK;");
                 }

From a4a808818f32b937a4228e9311e3e3b413a1b1d7 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 25 Jun 2010 21:48:19 +0100
Subject: [PATCH 03/96] don't report the null uuid as a missing asset on saving
 oars/iars

---
 .../Region/CoreModules/World/Archiver/AssetsRequest.cs    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index a1451ce705..4d360f6be5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -134,7 +134,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             
             foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids)
             {
-                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
+                if (kvp.Key != UUID.Zero)
+                    m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
             }
 
             m_requestCallbackTimer.Enabled = true;
@@ -269,7 +270,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
+                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}{1}", e.Message, e.StackTrace);
             }
         }
 
@@ -285,7 +286,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e);
+                    "[ARCHIVER]: Terminating archive creation since asset requester callback failed with {0}{1}", 
+                    e.Message, e.StackTrace);
             }
         }
     }

From 5b6485481bbabc2cbe37af00fe55656c12db4b9e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 11:02:09 -0700
Subject: [PATCH 04/96] Add extra Gitminster config options to ini.example

---
 bin/OpenSim.ini.example | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6fdfcf2294..a71fe7237e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -887,6 +887,13 @@
 Enabled = true
 RepoPath = "git"
 
+;How many frames between the scheduled commits?
+CommitFrameInterval = 360000
+
+;Should we automatically commit when necessary to avoid objects never making it into the repo?
+UseSafetyCommit = true
+
+
 [SVN]
     Enabled = false
     Directory = SVNmodule\repo

From 70d3b9aecaf5bf2447b43a1359c631eb60ca66aa Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 11:14:58 -0700
Subject: [PATCH 05/96] Add a DeleteAllSceneObjects(bool exceptNoCopy) method
 to allow  NoCopy objects to be retained when the scene is cleared.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index dc58d84e45..c596baa9d6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2182,6 +2182,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// Delete every object from the scene.  This does not include attachments worn by avatars.
         /// </summary>
         public void DeleteAllSceneObjects()
+        {
+            DeleteAllSceneObjects(false);
+        }
+
+        /// <summary>
+        /// Delete every object from the scene.  This does not include attachments worn by avatars.
+        /// </summary>
+        public void DeleteAllSceneObjects(bool exceptNoCopy)
         {
             lock (Entities)
             {
@@ -2192,8 +2200,13 @@ namespace OpenSim.Region.Framework.Scenes
                     if (e is SceneObjectGroup)
                     {
                         SceneObjectGroup sog = (SceneObjectGroup)e;
-                        if (!sog.IsAttachment)
-                            DeleteSceneObject((SceneObjectGroup)e, false);
+                        if (sog != null && !sog.IsAttachment)
+                        {
+                            if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
+                            {
+                                DeleteSceneObject((SceneObjectGroup)e, false);
+                            }
+                        }
                     }
                 }
             }

From acab2a159d150072aa9952100aa6722cbd51c1ea Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 11:24:36 -0700
Subject: [PATCH 06/96] Return objects which are NoCopy instead of just leaving
  them when cleaning the scene, if exceptNoCopy = true.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c596baa9d6..abc7377730 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2206,6 +2206,10 @@ namespace OpenSim.Region.Framework.Scenes
                             {
                                 DeleteSceneObject((SceneObjectGroup)e, false);
                             }
+                            else
+                            {
+                                DeRezObject(null, sog.RootPart.LocalId, sog.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                            }
                         }
                     }
                 }

From bd19cf739a03e255b0bf46021d3fab6ea0148afb Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 12:38:08 -0700
Subject: [PATCH 07/96] Fix a bug with DeRezObjects (check for a null
 remoteClient)

---
 .../Region/Framework/Scenes/Scene.Inventory.cs   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5e1798be80..83fd34974d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1591,15 +1591,17 @@ namespace OpenSim.Region.Framework.Scenes
                 // So that we know the database is upto date,
                 // for when deleting the object from it
                 ForceSceneObjectBackup(grp);
+                if (remoteClient != null)
+                {
+                    if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                        permissionToTakeCopy = false;
+                    if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
+                        permissionToTake = false;
 
-                if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
-                    permissionToTakeCopy = false;
-                if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
-                    permissionToTake = false;
-
-                if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
-                    permissionToDelete = false;
+                    if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
+                        permissionToDelete = false;
 
+                }
             }
 
             // Handle god perms

From ed5dac7e82adfe639a2057ed5d531418277869d7 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 13:06:47 -0700
Subject: [PATCH 08/96] Fix another nullref issue in DeRezSceneObject

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 83fd34974d..038019957e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1605,7 +1605,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Handle god perms
-            if (Permissions.IsGod(remoteClient.AgentId))
+            if (remoteClient != null && Permissions.IsGod(remoteClient.AgentId))
             {
                 permissionToTake = true;
                 permissionToTakeCopy = true;

From d188ed8ed86661a79b68f5c43ce0a94dc51308f0 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 13:07:17 -0700
Subject: [PATCH 09/96] Return everything at once, it's more efficient that way

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index abc7377730..bbac9191c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2191,6 +2191,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void DeleteAllSceneObjects(bool exceptNoCopy)
         {
+            List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
             lock (Entities)
             {
                 ICollection<EntityBase> entities = new List<EntityBase>(Entities);
@@ -2208,12 +2209,16 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                             else
                             {
-                                DeRezObject(null, sog.RootPart.LocalId, sog.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                                toReturn.Add((SceneObjectGroup)e);   
                             }
                         }
                     }
                 }
             }
+            if (toReturn.Count > 0)
+            {
+                returnObjects(toReturn.ToArray(), UUID.Zero);
+            }
         }
 
         /// <summary>

From 8f0adfbfb264532d55c0f0bab5bc508d36ad365e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 15:15:19 -0700
Subject: [PATCH 10/96] Trigger the RegionLightShareData OnSave event properly
 when the profile is saved

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bbac9191c2..c5fb19804d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1770,6 +1770,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void StoreWindlightProfile(RegionLightShareData wl)
         {
             m_regInfo.WindlightSettings = wl;
+            wl.Save();
             m_storageManager.DataStore.StoreRegionWindlightSettings(wl);
             m_eventManager.TriggerOnSaveNewWindlightProfile();
         }

From 49272657d7085471b85a4735968495bda31f599f Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 15:30:47 -0700
Subject: [PATCH 11/96] Make RegionLightShareData serializable

---
 OpenSim/Framework/RegionInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index afc4060044..2a74e7938d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {
+    [Serializable]
     public class RegionLightShareData : ICloneable
     {
         public UUID regionID = UUID.Zero;

From c3e806a2eac31c4dde67586f0404c796628ba9ce Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 17:25:45 -0700
Subject: [PATCH 12/96] Add a new accessor for the TerainModule : "HasChanged"

---
 OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 1e7ea7bce6..5bf1f9c89d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -93,6 +93,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             get { return m_commander; }
         }
 
+        public bool HasChanged
+        {
+            get
+            {
+                return m_tainted;
+            }
+        }
+
         #endregion
 
         #region INonSharedRegionModule Members

From 3bcee57e3efbd63f392067bff1a01ae51be98d13 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 17:34:19 -0700
Subject: [PATCH 13/96] add HasChanged to ITerrainModule

---
 OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 7 ++-----
 OpenSim/Region/Framework/Interfaces/ITerrainModule.cs     | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 5bf1f9c89d..ffd86a4c6e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -93,12 +93,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             get { return m_commander; }
         }
 
-        public bool HasChanged
+        public bool HasChanged()
         {
-            get
-            {
-                return m_tainted;
-            }
+            return m_tainted;
         }
 
         #endregion
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 5947afb927..98996e2984 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
         /// </summary>
         void TaintTerrain();
-        
+
+        bool HasChanged();
         /// <summary>
         /// Load a terrain from a stream.
         /// </summary>

From c97e9f86219cd79e6fee7266174e78825c405476 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 18:43:01 -0700
Subject: [PATCH 14/96] Reverting the ITerrainModule changes. Turns out this
 was useless.

---
 OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 5 -----
 OpenSim/Region/Framework/Interfaces/ITerrainModule.cs     | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index ffd86a4c6e..1e7ea7bce6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -93,11 +93,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             get { return m_commander; }
         }
 
-        public bool HasChanged()
-        {
-            return m_tainted;
-        }
-
         #endregion
 
         #region INonSharedRegionModule Members
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 98996e2984..5947afb927 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -42,8 +42,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
         /// </summary>
         void TaintTerrain();
-
-        bool HasChanged();
+        
         /// <summary>
         /// Load a terrain from a stream.
         /// </summary>

From 592ff1288dd1fccc1d2efde90e94ca0ab4a57652 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 18:51:19 -0700
Subject: [PATCH 15/96] Add a new global event : OnTerrainUpdate

---
 .../World/Terrain/TerrainModule.cs            |  2 ++
 .../Region/Framework/Scenes/EventManager.cs   | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 1e7ea7bce6..0c2039354b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -544,6 +544,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
                 m_scene.SaveTerrain();
 
+                m_scene.EventManager.TriggerTerrainUpdate();
+
                 // Clients who look at the map will never see changes after they looked at the map, so i've commented this out.
                 //m_scene.CreateTerrainTexture(true);
             }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index ef125cd357..0c9759d946 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -55,8 +55,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public delegate void OnTerrainTickDelegate();
 
+        public delegate void OnTerrainUpdateDelegate();
+
         public event OnTerrainTickDelegate OnTerrainTick;
 
+        public event OnTerrainUpdateDelegate OnTerrainUpdate;
+
         public delegate void OnBackupDelegate(IRegionDataStore datastore, bool forceBackup);
 
         public event OnBackupDelegate OnBackup;
@@ -716,6 +720,26 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+        public void TriggerTerrainUpdate()
+        {
+            OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
+            if (handlerTerrainUpdate != null)
+            {
+                foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
+                {
+                    try
+                    {
+                        d();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
 
         public void TriggerTerrainTick()
         {

From 9f00f141fe679b13e93240589f7d8b7f519e012b Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 18:54:55 -0700
Subject: [PATCH 16/96] Restore "AllowCareminsterFunctions" as an alias to the
 new "AllowLightshareFunctions".

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index fe71ed54cd..1fa8c30628 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -73,6 +73,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
                 m_LSFunctionsEnabled = true;
 
+            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
+                m_LSFunctionsEnabled = true;
+            
             m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
             if (m_comms == null)
                 m_LSFunctionsEnabled = false;

From ef0ac7c4032ebb369479c18a4f2cc432b613234f Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 23:20:28 -0700
Subject: [PATCH 17/96] Deal with incoming land objects properly so they don't
 just stack up

---
 .../World/Land/LandManagementModule.cs          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 91c8130f99..cfee1b0cc0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1303,18 +1303,31 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
-            for (int i = 0; i < data.Count; i++)
+            lock (m_landList)
             {
-                IncomingLandObjectFromStorage(data[i]);
+                //Remove all the land objects in the sim and then process our new data
+                foreach (int n in m_landList.Keys)
+                {
+                    m_scene.EventManager.TriggerLandObjectRemoved(m_landList[n].LandData.GlobalID);
+                }
+                m_landIDList.Initialize();
+                m_landList.Clear();
+
+                for (int i = 0; i < data.Count; i++)
+                {
+                    IncomingLandObjectFromStorage(data[i]);
+                }
             }
         }
 
         public void IncomingLandObjectFromStorage(LandData data)
         {
+
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
             new_land.SetLandBitmapFromByteArray();
             AddLandObject(new_land);
+            new_land.SendLandUpdateToAvatarsOverMe();
         }
 
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)

From 19f18c8a1b6377fec44ebd358bb4d810d36bd586 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sun, 27 Jun 2010 21:04:30 +0200
Subject: [PATCH 18/96] Make drag copy and copy-on-ray handle friends list
 perms properly

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 81ef54f949..dfcbc4cca0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1851,6 +1851,28 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
+                    if (copy.OwnerID != AgentID)
+                    {
+                        copy.SetOwnerId(AgentID);
+                        copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
+
+                        List<SceneObjectPart> partList =
+                            new List<SceneObjectPart>(copy.Children.Values);
+
+                        if (m_parentScene.Permissions.PropagatePermissions())
+                        {
+                            foreach (SceneObjectPart child in partList)
+                            {
+                                child.Inventory.ChangeInventoryOwner(AgentID);
+                                child.TriggerScriptChangedEvent(Changed.OWNER);
+                                child.ApplyNextOwnerPermissions();
+                            }
+                        }
+
+                        copy.RootPart.ObjectSaleType = 0;
+                        copy.RootPart.SalePrice = 10;
+                    }
+
                     Entities.Add(copy);
 
                     // Since we copy from a source group that is in selected

From 205d2496f6251244f69004c70b8c5db63b55bc98 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 27 Jun 2010 20:04:39 +0100
Subject: [PATCH 19/96] Fix permission propagation to prevent permanently
 locked objects from being created.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 64bdc99bb8..750b1f7f50 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (Permissions.PropagatePermissions() && recipient != senderId)
                 {
                     // First, make sore base is limited to the next perms
-                    itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
+                    itemCopy.BasePermissions = item.BasePermissions & (item.NextPermissions | (uint)PermissionMask.Move);
                     // By default, current equals base
                     itemCopy.CurrentPermissions = itemCopy.BasePermissions;
 
@@ -897,7 +897,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions())
             {
-                agentItem.BasePermissions = taskItem.BasePermissions & taskItem.NextPermissions;
+                agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
                     agentItem.CurrentPermissions = agentItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13);
                     agentItem.CurrentPermissions = agentItem.BasePermissions ;
@@ -1092,7 +1092,7 @@ namespace OpenSim.Region.Framework.Scenes
                     destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
                             srcTaskItem.NextPermissions;
                     destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.CurrentPermissions |= 8; // Slam!
                 }
             }

From 9c553cd254b5b27f3ddcffddee9684aeb4a6298b Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 27 Jun 2010 20:20:08 +0100
Subject: [PATCH 20/96] Fix more perms weirdness. Preserve "Locked" status
 across gives and rez/take. Preserve "Anyone can move" flag in most cases.

---
 .../Region/Framework/Scenes/Scene.Inventory.cs  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 55c1575464..6532537fb3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -402,7 +402,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // First, make sore base is limited to the next perms
                     itemCopy.BasePermissions = item.BasePermissions & (item.NextPermissions | (uint)PermissionMask.Move);
                     // By default, current equals base
-                    itemCopy.CurrentPermissions = itemCopy.BasePermissions;
+                    itemCopy.CurrentPermissions = itemCopy.BasePermissions & item.CurrentPermissions;
 
                     // If this is an object, replace current perms
                     // with folded perms
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
                     // Ensure there is no escalation
-                    itemCopy.CurrentPermissions &= item.NextPermissions;
+                    itemCopy.CurrentPermissions &= (item.NextPermissions | (uint)PermissionMask.Move);
 
                     // Need slam bit on xfer
                     itemCopy.CurrentPermissions |= 8;
@@ -918,12 +918,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
-                    agentItem.CurrentPermissions = agentItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13);
-                    agentItem.CurrentPermissions = agentItem.BasePermissions ;
+                    agentItem.CurrentPermissions = agentItem.BasePermissions & (((taskItem.CurrentPermissions & 7) << 13) | (taskItem.CurrentPermissions & (uint)PermissionMask.Move));
+                else
+                    agentItem.CurrentPermissions = agentItem.BasePermissions & taskItem.CurrentPermissions;
 
                 agentItem.CurrentPermissions |= 8;
                 agentItem.NextPermissions = taskItem.NextPermissions;
-                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & taskItem.NextPermissions;
+                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 agentItem.GroupPermissions = taskItem.GroupPermissions & taskItem.NextPermissions;
             }
             else
@@ -1105,11 +1106,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (Permissions.PropagatePermissions())
                 {
                     destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
                             (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.CurrentPermissions |= 8; // Slam!

From 3612a5252bdfe0a1d231fee669aa73183ee7b493 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 27 Jun 2010 20:20:08 +0100
Subject: [PATCH 21/96] Fix more perms weirdness. Preserve "Locked" status
 across gives and rez/take. Preserve "Anyone can move" flag in most cases.

---
 .../Region/Framework/Scenes/Scene.Inventory.cs  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 750b1f7f50..9278164808 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -387,7 +387,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // First, make sore base is limited to the next perms
                     itemCopy.BasePermissions = item.BasePermissions & (item.NextPermissions | (uint)PermissionMask.Move);
                     // By default, current equals base
-                    itemCopy.CurrentPermissions = itemCopy.BasePermissions;
+                    itemCopy.CurrentPermissions = itemCopy.BasePermissions & item.CurrentPermissions;
 
                     // If this is an object, replace current perms
                     // with folded perms
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
                     // Ensure there is no escalation
-                    itemCopy.CurrentPermissions &= item.NextPermissions;
+                    itemCopy.CurrentPermissions &= (item.NextPermissions | (uint)PermissionMask.Move);
 
                     // Need slam bit on xfer
                     itemCopy.CurrentPermissions |= 8;
@@ -899,12 +899,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
-                    agentItem.CurrentPermissions = agentItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13);
-                    agentItem.CurrentPermissions = agentItem.BasePermissions ;
+                    agentItem.CurrentPermissions = agentItem.BasePermissions & (((taskItem.CurrentPermissions & 7) << 13) | (taskItem.CurrentPermissions & (uint)PermissionMask.Move));
+                else
+                    agentItem.CurrentPermissions = agentItem.BasePermissions & taskItem.CurrentPermissions;
 
                 agentItem.CurrentPermissions |= 8;
                 agentItem.NextPermissions = taskItem.NextPermissions;
-                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & taskItem.NextPermissions;
+                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 agentItem.GroupPermissions = taskItem.GroupPermissions & taskItem.NextPermissions;
             }
             else
@@ -1086,11 +1087,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (Permissions.PropagatePermissions())
                 {
                     destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
-                            srcTaskItem.NextPermissions;
+                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
                             (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                     destTaskItem.CurrentPermissions |= 8; // Slam!

From b0129b35f8dbe24b8e857223b3ac8ba4cb7cc830 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 27 Jun 2010 12:37:16 -0700
Subject: [PATCH 22/96] Added checks to XInventory DB layer to truncate names
 and descriptions.

---
 OpenSim/Data/MySQL/MySQLXInventoryData.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index 0fe801d696..3c73095fc3 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -64,14 +64,22 @@ namespace OpenSim.Data.MySQL
 
         public bool StoreFolder(XInventoryFolder folder)
         {
+            if (folder.folderName.Length > 64)
+                folder.folderName = folder.folderName.Substring(0, 64);
+
             return m_Folders.Store(folder);
         }
 
         public bool StoreItem(XInventoryItem item)
         {
+            if (item.inventoryName.Length > 64)
+                item.inventoryName = item.inventoryName.Substring(0, 64);
+            if (item.inventoryDescription.Length > 128)
+                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
+
             return m_Items.Store(item);
         }
-
+        
         public bool DeleteFolders(string field, string val)
         {
             return m_Folders.Delete(field, val);

From 76d2f0f68e16f9b74ce4f81f9ecbf370f39f3ac6 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 27 Jun 2010 12:40:17 -0700
Subject: [PATCH 23/96] Same patch as before but for SQLite.

---
 OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 6064538990..ca651e1998 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -66,11 +66,19 @@ namespace OpenSim.Data.SQLite
 
         public bool StoreFolder(XInventoryFolder folder)
         {
+            if (folder.folderName.Length > 64)
+                folder.folderName = folder.folderName.Substring(0, 64);
+
             return m_Folders.Store(folder);
         }
 
         public bool StoreItem(XInventoryItem item)
         {
+            if (item.inventoryName.Length > 64)
+                item.inventoryName = item.inventoryName.Substring(0, 64);
+            if (item.inventoryDescription.Length > 128)
+                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
+
             return m_Items.Store(item);
         }
 

From 7868f1f650a7d20ca7a6b5a236f89301c193444e Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 27 Jun 2010 13:06:39 -0700
Subject: [PATCH 24/96] Fixed Robust.32BitLaunch.exe

---
 .../Robust.32BitLaunch.csproj                 |   4 ++--
 bin/Robust.32BitLaunch.exe                    | Bin 5632 -> 5632 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
index f19e082c28..481b3f8486 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
@@ -36,9 +36,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="OpenSim.Server, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\bin\OpenSim.Server.exe</HintPath>
+      <HintPath>..\..\..\bin\Robust.exe</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 14a6db3f1f70a6b5767aeede7a5520821301b606..747d02ff03628e0b5fffabf343a67333bc577b25 100644
GIT binary patch
delta 464
zcmZqBY0#O_!IH2>-DhIY999D@1_qhQicC6_BN=z|$Z#?+Ff%YPFfuT(O*Z5;m>j_L
zMb`u<q8waOl$n=a43uMdz{<dI1E@kdG?-xrI|G9NP)yl9)YAn>pO{?8oaj@>kix*m
zu##aqkURh;?}EucU{aJ3B(4W0J;7uOn4H5{%gDyC0Zi@#i(ChiljT@+*oByxnb{aL
zCkL{WvWqZ80-@yOvn=*L3e0W{oIsucgB}AngFlcI23n!VAkDBINGgL#ZHBEtwlP@T
zn&C2#?F<$V29wbYuYn@j45EyaBUt5_HUv+uVBIpglig^uHd`#?=H2X!jBG*qNu|Xl
zlXr6%ZGOXXgHeDd<J$a0<8I&HNh_wyHtmm?e1*$@@;Yvh$;#Z_lfQABMSubq6jDq;
z+ziA%z(DrlVPFUfb_p)K>G0cs*+G~2$9_2dp1a{aFd!M6tztrpQ;UjYoQpDxOA=#J
qQp;lU3sUonGjny5^NUhpoXtHv8LXT}42BFQ3`PtloBs+jvj70n9d<JS

delta 446
zcmZqBY0#O_!Lq*cnD@k<IjkC53=A@p6`6D<M>6i_5#eNDU}j)oU}Rumn{3EyFgbwf
zi>?k(L^-&mC^Ij;7%0bZgB6H@DwIQm88)ypFbDv}l-)x;U4Zm~$%V{`K4lCk3~UU&
zU~(0hJP9Trfyv)sQj8I##t=+qGI}wxG1P*|Zm`G_FnOEtAmd~?79DnO=08kq3`&y&
zSxVU@86tsDWb#=Sdml+=HwI21Pk=#>ft$e}ND4Eg14(HxsmzcIWNU-PjTyRuY-_N%
zH<%1&SPT?NW;hEZvl(tNOpaicW4hirxq@}e=6JRk#>v`j#+!GuGcry-%wf3sE5~(4
zfoI-pFZ|<A^O{ioaZBV%_WsFtxcny<b9YbH=JuHUkK0TK6sn*gVgllBAa((Ut_u$X
zLr}0w@R$GXnfc!)_^(Mw-EcA2Aars9kAzH0W?5oNW^qYTehi4I3ub2~m6l}Y=WXuc
U$zbI)W-w+j0%FU}e+8LY0MkEjVE_OC


From 3dbc7360498582278a9dad9eb899431d14e4e9cf Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 27 Jun 2010 13:23:51 -0700
Subject: [PATCH 25/96] Addresses mantis #4789. Not really a fix, because the
 event is harmless anyway. Just shouldn't happen normally.

---
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 191acc946a..bc31815d8a 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Server.Handlers.Simulation
             //responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); ??? instead
         }
 
-        // subclasses cab override this
+        // subclasses can override this
         protected virtual bool UpdateAgent(GridRegion destination, AgentData agent)
         {
             return m_SimulationService.UpdateAgent(destination, agent);
@@ -280,6 +280,12 @@ namespace OpenSim.Server.Handlers.Simulation
 
         protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID)
         {
+            if (m_SimulationService == null)
+            {
+                m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless.");
+                return;
+            }
+
             GridRegion destination = new GridRegion();
             destination.RegionID = regionID;
 

From 6cf0b8f6fe0f8d35635e2a96953ce260a200d9c8 Mon Sep 17 00:00:00 2001
From: Robert Adams <Robert.Adams@intel.com>
Date: Thu, 24 Jun 2010 09:11:27 -0700
Subject: [PATCH 26/96] Add command-script to the Robust console

---
 OpenSim/Server/Base/ServicesServerBase.cs | 41 +++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index a5bebb859f..dee31bdf58 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -230,6 +230,12 @@ namespace OpenSim.Server.Base
                     "shutdown",
                     "Quit the application", HandleQuit);
 
+            // Register a command to read other commands from a file
+            MainConsole.Instance.Commands.AddCommand("base", false, "command-script",
+                                          "command-script <script>",
+                                          "Run a command script from file", HandleScript);
+
+
             // Allow derived classes to perform initialization that
             // needs to be done after the console has opened
             //
@@ -259,6 +265,41 @@ namespace OpenSim.Server.Base
             m_log.Info("[CONSOLE] Quitting");
         }
 
+        protected virtual void HandleScript(string module, string[] parms)
+        {
+            if (parms.Length != 2)
+            {
+                return;
+            }
+            RunCommandScript(parms[1]);
+        }
+
+        /// <summary>
+        /// Run an optional startup list of commands
+        /// </summary>
+        /// <param name="fileName"></param>
+        private void RunCommandScript(string fileName)
+        {
+            if (File.Exists(fileName))
+            {
+                m_log.Info("[COMMANDFILE]: Running " + fileName);
+
+                using (StreamReader readFile = File.OpenText(fileName))
+                {
+                    string currentCommand;
+                    while ((currentCommand = readFile.ReadLine()) != null)
+                    {
+                        if (currentCommand != String.Empty)
+                        {
+                            m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'");
+                            MainConsole.Instance.RunCommand(currentCommand);
+                        }
+                    }
+                }
+            }
+        }
+
+
         protected virtual void ReadConfig()
         {
         }

From 660a560d3ba0a4f4089fd173c30b3034f007d983 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sun, 27 Jun 2010 21:04:30 +0200
Subject: [PATCH 27/96] Make drag copy and copy-on-ray handle friends list
 perms properly

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 240c688ff6..ebb30050b8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1750,6 +1750,28 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
+                    if (copy.OwnerID != AgentID)
+                    {
+                        copy.SetOwnerId(AgentID);
+                        copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
+
+                        List<SceneObjectPart> partList =
+                            new List<SceneObjectPart>(copy.Children.Values);
+
+                        if (m_parentScene.Permissions.PropagatePermissions())
+                        {
+                            foreach (SceneObjectPart child in partList)
+                            {
+                                child.Inventory.ChangeInventoryOwner(AgentID);
+                                child.TriggerScriptChangedEvent(Changed.OWNER);
+                                child.ApplyNextOwnerPermissions();
+                            }
+                        }
+
+                        copy.RootPart.ObjectSaleType = 0;
+                        copy.RootPart.SalePrice = 10;
+                    }
+
                     Entities.Add(copy);
 
                     // Since we copy from a source group that is in selected

From 1499fd85c417fe5825b7080c07ab2d8e3e25ad09 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 27 Jun 2010 21:02:03 +0100
Subject: [PATCH 28/96] Fix a simian compiler warning

---
 .../Connectors/SimianGrid/SimianAssetServiceConnector.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 34bb8b38c8..7a420e4dc4 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <returns></returns>
         public bool Delete(string id)
         {
-            string errorMessage = String.Empty;
+            //string errorMessage = String.Empty;
             string url = m_serverUrl + id;
 
             if (m_cache != null)

From d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 01:29:30 +0200
Subject: [PATCH 29/96] Fix Copy on Ray, Drag Copy and other little things.
 Removed the wrong and nonworking ownership assignment in SOG, which messed
 things up before. No longer trust the client to send the ID of the person
 something is copied as, since it allows to run a script with someone else's
 permissions. Properly adjust inventory ownership and perms.

---
 .../ClientStack/LindenUDP/LLClientView.cs      |  6 +++---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs  |  2 +-
 .../Framework/Scenes/SceneObjectGroup.cs       | 18 ++----------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f0718419d7..cf1dda9c6e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6307,8 +6307,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerObjectDuplicate != null)
                 {
                     handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset,
-                                           dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID,
-                                           AgentandGroupData.GroupID);
+                                           dupe.SharedData.DuplicateFlags, AgentId,
+                                           m_activeGroupID);
                 }
             }
 
@@ -6898,7 +6898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerObjectDuplicateOnRay != null)
                 {
                     handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags,
-                                                dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
+                                                AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
                                                 dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection,
                                                 dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
                 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index dfcbc4cca0..69a909bc29 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
-                    if (copy.OwnerID != AgentID)
+                    if (original.OwnerID != AgentID)
                     {
                         copy.SetOwnerId(AgentID);
                         copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7081cedc5b..241295fd27 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1781,7 +1781,9 @@ namespace OpenSim.Region.Framework.Scenes
             dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
 
             if (!userExposed)
+            {
                 dupe.RootPart.IsAttachment = previousAttachmentStatus;
+            }
 
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
@@ -1806,16 +1808,6 @@ namespace OpenSim.Region.Framework.Scenes
                 dupe.RootPart.DoPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical, true);
             }
 
-            // Now we've made a copy that replaces this one, we need to
-            // switch the owner to the person who did the copying
-            // Second Life copies an object and duplicates the first one in it's place
-            // So, we have to make a copy of this one, set it in it's place then set the owner on this one
-            if (userExposed)
-            {
-                SetRootPartOwner(m_rootPart, cAgentID, cGroupID);
-                m_rootPart.ScheduleFullUpdate();
-            }
-            
             List<SceneObjectPart> partList;
 
             lockPartsForRead(true);
@@ -1837,12 +1829,6 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
 
                     newPart.LinkNum = part.LinkNum;
-
-                    if (userExposed)
-                    {
-                        SetPartOwner(newPart, cAgentID, cGroupID);
-                        newPart.ScheduleFullUpdate();
-                    }
                 }
             }
 

From a817f6b48c27fe5e950846d687edcd4d375a3c6c Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 01:48:24 +0200
Subject: [PATCH 30/96] Remove AgentID and GroupOD from the signature of
 SOG.Copy(). They were never used, but made for a very mispleading read of the
 code in the callers.

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs               | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs         | 6 +++---
 .../ContentManagementSystem/ContentManagementEntity.cs      | 2 +-
 .../OptionalModules/ContentManagementSystem/MetaEntity.cs   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 69a909bc29..a36800b57b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1848,7 +1848,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_parentScene.Permissions.CanDuplicateObject(original.Children.Count, original.UUID, AgentID, original.AbsolutePosition))
                 {
-                    SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
+                    SceneObjectGroup copy = original.Copy(true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
                     if (original.OwnerID != AgentID)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 241295fd27..c48ce3baa5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1700,7 +1700,7 @@ namespace OpenSim.Region.Framework.Scenes
                             "[SCENE]: Storing {0}, {1} in {2}",
                             Name, UUID, m_scene.RegionInfo.RegionName);
 
-                        SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false);
+                        SceneObjectGroup backup_group = Copy(false);
                         backup_group.RootPart.Velocity = RootPart.Velocity;
                         backup_group.RootPart.Acceleration = RootPart.Acceleration;
                         backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Duplicates this object, including operations such as physics set up and attaching to the backup event.
         /// </summary>
         /// <returns></returns>
-        public SceneObjectGroup Copy(UUID cAgentID, UUID cGroupID, bool userExposed)
+        public SceneObjectGroup Copy(bool userExposed)
         {
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
             dupe.m_isBackedUp = false;
@@ -3897,7 +3897,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public virtual ISceneObject CloneForNewScene()
         {
-            SceneObjectGroup sog = Copy(this.OwnerID, this.GroupID, false);
+            SceneObjectGroup sog = Copy(false);
             sog.m_isDeleted = false;
             return sog;
         }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index c277034171..ada67011b3 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         public ContentManagementEntity(SceneObjectGroup Unchanged, bool physics)
             : base(Unchanged, false)
         {
-            m_UnchangedEntity = Unchanged.Copy(Unchanged.RootPart.OwnerID, Unchanged.RootPart.GroupID, false);
+            m_UnchangedEntity = Unchanged.Copy(false);
         }
 
         public ContentManagementEntity(string objectXML, Scene scene,  bool physics)
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index 1a72971b56..841ee00e59 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         /// </summary>
         public MetaEntity(SceneObjectGroup orig, bool physics)
         {
-            m_Entity = orig.Copy(orig.RootPart.OwnerID, orig.RootPart.GroupID, false);
+            m_Entity = orig.Copy(false);
             Initialize(physics);
         }
 

From 4fa1d4896c89d9907fe49f3ad718444b63c03ec9 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 02:30:36 +0200
Subject: [PATCH 31/96] Change the way IRegionModule us referenced by
 IEmailModule to allow later conversion to new style

---
 .../Region/CoreModules/Scripting/EMailModules/EmailModule.cs    | 2 +-
 OpenSim/Region/Framework/Interfaces/IEmailModule.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 83f004dc60..c0975eaaa0 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
-    public class EmailModule : IEmailModule
+    public class EmailModule : IRegionModule, IEmailModule
     {
         //
         // Log
diff --git a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index 3a2c4231cf..4f1b91adee 100644
--- a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Interfaces
         public int numLeft;
     }
 
-    public interface IEmailModule : IRegionModule
+    public interface IEmailModule
     {
         void SendEmail(UUID objectID, string address, string subject, string body);
         Email GetNextEmail(UUID objectID, string sender, string subject);

From 4cdda2cae9f91ac793bfaf192e94cbe4607c3886 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 01:29:30 +0200
Subject: [PATCH 32/96] Fix Copy on Ray, Drag Copy and other little things.
 Removed the wrong and nonworking ownership assignment in SOG, which messed
 things up before. No longer trust the client to send the ID of the person
 something is copied as, since it allows to run a script with someone else's
 permissions. Properly adjust inventory ownership and perms.

---
 .../ClientStack/LindenUDP/LLClientView.cs      |  6 +++---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs  |  2 +-
 .../Framework/Scenes/SceneObjectGroup.cs       | 18 ++----------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index cdd22def16..d2824bd8c7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6303,8 +6303,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerObjectDuplicate != null)
                 {
                     handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset,
-                                           dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID,
-                                           AgentandGroupData.GroupID);
+                                           dupe.SharedData.DuplicateFlags, AgentId,
+                                           m_activeGroupID);
                 }
             }
 
@@ -6894,7 +6894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerObjectDuplicateOnRay != null)
                 {
                     handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags,
-                                                dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
+                                                AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd,
                                                 dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection,
                                                 dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates);
                 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ebb30050b8..5fea332919 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
-                    if (copy.OwnerID != AgentID)
+                    if (original.OwnerID != AgentID)
                     {
                         copy.SetOwnerId(AgentID);
                         copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e23f39ffbc..fad470f683 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1551,7 +1551,9 @@ namespace OpenSim.Region.Framework.Scenes
             dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
 
             if (!userExposed)
+            {
                 dupe.RootPart.IsAttachment = previousAttachmentStatus;
+            }
 
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
@@ -1576,16 +1578,6 @@ namespace OpenSim.Region.Framework.Scenes
                 dupe.RootPart.DoPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical, true);
             }
 
-            // Now we've made a copy that replaces this one, we need to
-            // switch the owner to the person who did the copying
-            // Second Life copies an object and duplicates the first one in it's place
-            // So, we have to make a copy of this one, set it in it's place then set the owner on this one
-            if (userExposed)
-            {
-                SetRootPartOwner(m_rootPart, cAgentID, cGroupID);
-                m_rootPart.ScheduleFullUpdate();
-            }
-            
             List<SceneObjectPart> partList;
 
             lock (m_parts)
@@ -1606,12 +1598,6 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
 
                     newPart.LinkNum = part.LinkNum;
-
-                    if (userExposed)
-                    {
-                        SetPartOwner(newPart, cAgentID, cGroupID);
-                        newPart.ScheduleFullUpdate();
-                    }
                 }
             }
 

From 85a9c305a202516b08b566b1120750010461022c Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 01:48:24 +0200
Subject: [PATCH 33/96] Remove AgentID and GroupOD from the signature of
 SOG.Copy(). They were never used, but made for a very mispleading read of the
 code in the callers.

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs               | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs         | 6 +++---
 .../ContentManagementSystem/ContentManagementEntity.cs      | 2 +-
 .../OptionalModules/ContentManagementSystem/MetaEntity.cs   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 5fea332919..40332a6f93 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1747,7 +1747,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_parentScene.Permissions.CanDuplicateObject(original.Children.Count, original.UUID, AgentID, original.AbsolutePosition))
                 {
-                    SceneObjectGroup copy = original.Copy(AgentID, GroupID, true);
+                    SceneObjectGroup copy = original.Copy(true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
                     if (original.OwnerID != AgentID)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fad470f683..1ca390a7c1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Framework.Scenes
                             "[SCENE]: Storing {0}, {1} in {2}",
                             Name, UUID, m_scene.RegionInfo.RegionName);
 
-                        SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false);
+                        SceneObjectGroup backup_group = Copy(false);
                         backup_group.RootPart.Velocity = RootPart.Velocity;
                         backup_group.RootPart.Acceleration = RootPart.Acceleration;
                         backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
@@ -1528,7 +1528,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Duplicates this object, including operations such as physics set up and attaching to the backup event.
         /// </summary>
         /// <returns></returns>
-        public SceneObjectGroup Copy(UUID cAgentID, UUID cGroupID, bool userExposed)
+        public SceneObjectGroup Copy(bool userExposed)
         {
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
             dupe.m_isBackedUp = false;
@@ -3581,7 +3581,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public virtual ISceneObject CloneForNewScene()
         {
-            SceneObjectGroup sog = Copy(this.OwnerID, this.GroupID, false);
+            SceneObjectGroup sog = Copy(false);
             sog.m_isDeleted = false;
             return sog;
         }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index c277034171..ada67011b3 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         public ContentManagementEntity(SceneObjectGroup Unchanged, bool physics)
             : base(Unchanged, false)
         {
-            m_UnchangedEntity = Unchanged.Copy(Unchanged.RootPart.OwnerID, Unchanged.RootPart.GroupID, false);
+            m_UnchangedEntity = Unchanged.Copy(false);
         }
 
         public ContentManagementEntity(string objectXML, Scene scene,  bool physics)
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index 1a72971b56..841ee00e59 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         /// </summary>
         public MetaEntity(SceneObjectGroup orig, bool physics)
         {
-            m_Entity = orig.Copy(orig.RootPart.OwnerID, orig.RootPart.GroupID, false);
+            m_Entity = orig.Copy(false);
             Initialize(physics);
         }
 

From 0a82d10fc4827d4c537b5d23f0654d80ba89a2a3 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 02:30:36 +0200
Subject: [PATCH 34/96] Change the way IRegionModule us referenced by
 IEmailModule to allow later conversion to new style

---
 .../Region/CoreModules/Scripting/EMailModules/EmailModule.cs    | 2 +-
 OpenSim/Region/Framework/Interfaces/IEmailModule.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 83f004dc60..c0975eaaa0 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
-    public class EmailModule : IEmailModule
+    public class EmailModule : IRegionModule, IEmailModule
     {
         //
         // Log
diff --git a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index 3a2c4231cf..4f1b91adee 100644
--- a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Interfaces
         public int numLeft;
     }
 
-    public interface IEmailModule : IRegionModule
+    public interface IEmailModule
     {
         void SendEmail(UUID objectID, string address, string subject, string body);
         Email GetNextEmail(UUID objectID, string sender, string subject);

From 827d9be48f8177b5975df68208a8cf7c730b58f0 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 27 Jun 2010 22:23:01 -0700
Subject: [PATCH 35/96] Fix the sound issue. It was caused by missing assets;
 once the client has made one request, it continued to wait for asset before
 requesting any new ones, until the TransferRequest timed out. Fixed by adding
 a TransferAbortPacket if the asset cannot be retrieved.

---
 .../Region/ClientStack/LindenUDP/LLClientView.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f0718419d7..5b5dc1ec50 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2208,6 +2208,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(sound, ThrottleOutPacketType.Task);
         }
 
+        public void SendTransferAbort(TransferRequestPacket transferRequest)
+        {
+            TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
+            abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
+            abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
+            m_log.Debug("[Assets] Aborting transfer; asset request failed");
+            OutPacket(abort, ThrottleOutPacketType.Task);
+        }
+
         public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
         {
             SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -11502,7 +11511,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
 
-            m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
+            if (!m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived))
+            {
+                //We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
+                //which causes it to not request any more for a while. Which is bad.
+                SendTransferAbort(transferRequest);
+            }
         }
 
         /// <summary>

From 3e908023b2f7e9edb77687089f2363a77b13d1fc Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 28 Jun 2010 08:58:51 +0200
Subject: [PATCH 36/96] Force IM timestamps to current server time to prevent
 "Saved on" headers while the sender is online

---
 .../CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 2dc738479f..a7aa4ea0fb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            // Force timestamp to server time to avoid "Saved on" headers
+            // being generated for online users
+            im.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
             if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
                 dialog == (byte)InstantMessageDialog.MessageFromObject)
             {

From a5a1df68c29b2d78279bcff60ce66fe97772d0c6 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Mon, 28 Jun 2010 04:02:33 -0700
Subject: [PATCH 37/96] Provide the interface for StoreAsset to report success
 or failure

---
 OpenSim/Data/AssetDataBase.cs                    | 2 +-
 OpenSim/Data/IAssetData.cs                       | 2 +-
 OpenSim/Data/MSSQL/MSSQLAssetData.cs             | 4 +++-
 OpenSim/Data/MySQL/MySQLAssetData.cs             | 4 +++-
 OpenSim/Data/SQLite/SQLiteAssetData.cs           | 4 +++-
 OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs     | 4 +++-
 OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | 3 ++-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index e1a810c9af..b4ae913e53 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Data
     {
         public abstract AssetBase GetAsset(UUID uuid);
         
-        public abstract void StoreAsset(AssetBase asset);
+        public abstract bool StoreAsset(AssetBase asset);
         public abstract bool ExistsAsset(UUID uuid);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index 90d5eeb489..065d3a5f3d 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Data
     public interface IAssetDataPlugin : IPlugin
     {
         AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
+        bool StoreAsset(AssetBase asset);
         bool ExistsAsset(UUID uuid);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index c7488d853c..c882555231 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/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 void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
            
             string sql =
@@ -192,10 +192,12 @@ namespace OpenSim.Data.MSSQL
                 try
                 {
                     command.ExecuteNonQuery();
+                    return true;
                 }
                 catch(Exception e)
                 {
                     m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
+                    return false;
                 }
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index fe5152ad85..f9ce3d98ea 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -153,7 +153,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 void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -201,12 +201,14 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?data", asset.Data);
                             cmd.ExecuteNonQuery();
                             cmd.Dispose();
+                            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;
                     }
                 }
             }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 16e560c6df..75e51a3525 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
@@ -141,6 +141,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -161,6 +162,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
index df509023eb..3da298b463 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLiteLegacy
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
@@ -139,6 +139,7 @@ namespace OpenSim.Data.SQLiteLegacy
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
  
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -157,6 +158,7 @@ namespace OpenSim.Data.SQLiteLegacy
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
index 4a15cf2d64..5bab62c853 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common.Mock
             return assets.Find(x=>x.FullID == uuid);
         }
 
-        public void StoreAsset(AssetBase asset)
+        public bool StoreAsset(AssetBase asset)
         {
             assets.Add(asset);
+            return true;
         }
 
         public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }

From 06fa0388750b939ede9e3d7783e41a574e101397 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Mon, 28 Jun 2010 07:09:05 -0700
Subject: [PATCH 38/96] Return a UUID.Zero if the asset fails to upload

---
 OpenSim/Services/AssetService/AssetService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 470a4ddcc5..3122382308 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -144,7 +144,10 @@ namespace OpenSim.Services.AssetService
         public string Store(AssetBase asset)
         {
             //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID);
-            m_Database.StoreAsset(asset);
+            if (!m_Database.StoreAsset(asset))
+            {
+                return UUID.Zero.ToString();
+            }
 
             return asset.ID;
         }

From 20fc35399b8193e3620b0dadca861e90c4afe216 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 28 Jun 2010 14:10:22 -0700
Subject: [PATCH 39/96] Fixes mantis #4815 and #4812

---
 OpenSim/Services/GridService/HypergridLinker.cs | 6 +++++-
 bin/Robust.HG.ini.example                       | 4 ++++
 bin/config-include/StandaloneCommon.ini.example | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index af603b23e2..ae80a8c354 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -255,7 +255,11 @@ namespace OpenSim.Services.GridService
                 {
                     m_log.WarnFormat("[HYPERGRID LINKER]: Remote Gatekeeper at {0} provided malformed ExternalName {1}", regInfo.ExternalHostName, externalName);
                 }
-                regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort + ":" + regInfo.RegionName;
+                string name = regInfo.RegionName;
+                regInfo.RegionName = regInfo.ExternalHostName + ":" + regInfo.HttpPort;
+                if (name != string.Empty)
+                    regInfo.RegionName += ":" + name;
+
                 // Try get the map image
                 //regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL);
                 // I need a texture that works for this... the one I tried doesn't seem to be working
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 39228eb1d6..6b0029f0f7 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; CHANGE THIS
     ExternalName = "http://127.0.0.1:8002"
 
+	; Does this grid allow incoming links to any region in it? 
+	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+	AllowTeleportsToAnyRegion = true
+
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ;; for the service
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa67259ab..de8677f111 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
 
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
+
+	; Does this grid allow incoming links to any region in it? 
+	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+	AllowTeleportsToAnyRegion = true
+

From d1233501648d4c76abb259faf2a30095bc99b3f6 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 28 Jun 2010 16:04:12 -0700
Subject: [PATCH 40/96] One more bug fix in FriendsModule: GrantRights. One of
 the caches was not being updated.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 5552be7648..6f044cb8f1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -768,8 +768,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     bool canEditObjectsChanged = ((rights ^ userFlags) & (int)FriendRights.CanModifyObjects) != 0;
                     if (canEditObjectsChanged)
                         friendClient.SendChangeUserRights(userID, friendID, rights);
+
                 }
 
+                // update local cache
+                //m_Friends[friendID].Friends = m_FriendsService.GetFriends(friendID);
+                foreach (FriendInfo finfo in m_Friends[friendID].Friends)
+                    if (finfo.Friend == userID.ToString())
+                        finfo.TheirFlags = rights;
+
                 return true;
             }
 

From 621195e4f182d475b087049f4489e4c9187dd474 Mon Sep 17 00:00:00 2001
From: dahlia <dahliaTrimble@gmail.removeme.com>
Date: Mon, 28 Jun 2010 17:33:47 -0700
Subject: [PATCH 41/96] Thanks Micheil Merlin for Mantis #4784: [PATCH]
 llRotBetween does not return correct rotations for a 180 degree angle between
 vectors

Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
---
 .../Shared/Api/Implementation/LSL_Api.cs      | 89 +++++++++++++++----
 1 file changed, 71 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1feb153fb4..dc34e1c20d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -703,24 +703,77 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Rotation llRotBetween(LSL_Vector a, LSL_Vector b)
         {
-            //A and B should both be normalized
-            m_host.AddScriptLPS(1);
-            double dotProduct = LSL_Vector.Dot(a, b);
-            LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
-            double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
-            double angle = Math.Acos(dotProduct / magProduct);
-            LSL_Vector axis = LSL_Vector.Norm(crossProduct);
-            double s = Math.Sin(angle / 2);
-
-            double x = axis.x * s;
-            double y = axis.y * s;
-            double z = axis.z * s;
-            double w = Math.Cos(angle / 2);
-
-            if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
-                return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-
-            return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
+            //A and B should both be normalized
+            m_host.AddScriptLPS(1);
+            LSL_Rotation rotBetween;
+            // Check for zero vectors. If either is zero, return zero rotation. Otherwise,
+            // continue calculation.
+            if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f))
+            {
+                rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+            }
+            else
+            {
+                a = LSL_Vector.Norm(a);
+                b = LSL_Vector.Norm(b);
+                double dotProduct = LSL_Vector.Dot(a, b);
+                // There are two degenerate cases possible. These are for vectors 180 or
+                // 0 degrees apart. These have to be detected and handled individually.
+                //
+                // Check for vectors 180 degrees apart.
+                // A dot product of -1 would mean the angle between vectors is 180 degrees.
+                if (dotProduct < -0.9999999f)
+                {
+                    // First assume X axis is orthogonal to the vectors.
+                    LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f);
+                    orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a));
+                    // Check for near zero vector. A very small non-zero number here will create
+                    // a rotation in an undesired direction.
+                    if (LSL_Vector.Mag(orthoVector) > 0.0001)
+                    {
+                        rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f);
+                    }
+                    // If the magnitude of the vector was near zero, then assume the X axis is not
+                    // orthogonal and use the Z axis instead.
+                    else
+                    {
+                        // Set 180 z rotation.
+                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
+                    }
+                }
+                // Check for parallel vectors.
+                // A dot product of 1 would mean the angle between vectors is 0 degrees.
+                else if (dotProduct > 0.9999999f)
+                {
+                    // Set zero rotation.
+                    rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+                }
+                else
+                {
+                    // All special checks have been performed so get the axis of rotation.
+                    LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
+                    // Quarternion s value is the length of the unit vector + dot product.
+                    double qs = 1.0 + dotProduct;
+                    rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
+                    // Normalize the rotation.
+                    double mag = LSL_Rotation.Mag(rotBetween);
+                    // We shouldn't have to worry about a divide by zero here. The qs value will be
+                    // non-zero because we already know if we're here, then the dotProduct is not -1 so
+                    // qs will not be zero. Also, we've already handled the input vectors being zero so the
+                    // crossProduct vector should also not be zero.
+                    rotBetween.x = rotBetween.x / mag;
+                    rotBetween.y = rotBetween.y / mag;
+                    rotBetween.z = rotBetween.z / mag;
+                    rotBetween.s = rotBetween.s / mag;
+                    // Check for undefined values and set zero rotation if any found. This code might not actually be required
+                    // any longer since zero vectors are checked for at the top.
+                    if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
+                    {
+                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+                    }
+                }
+            }
+            return rotBetween;
         }
 
         public void llWhisper(int channelID, string text)

From 6f4d4543b94f28160d697489e591da6614f0c8fc Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 29 Jun 2010 03:51:16 +0200
Subject: [PATCH 42/96] Make newly created prims be named "Object" and make
 newly created scripts have a default touch handler. Compatibility patch

---
 OpenSim/Framework/PrimitiveBaseShape.cs            | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 4d1de22eeb..990c859418 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1196,7 +1196,7 @@ namespace OpenSim.Framework
             prim.Textures = this.Textures;
 
             prim.Properties = new Primitive.ObjectProperties();
-            prim.Properties.Name = "Primitive";
+            prim.Properties.Name = "Object";
             prim.Properties.Description = "";
             prim.Properties.CreatorID = UUID.Zero;
             prim.Properties.GroupID = UUID.Zero;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6532537fb3..a2a8882c3b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
-                    Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n}"),
+                    Encoding.ASCII.GetBytes("default\n{\n    state_entry()\n    {\n        llSay(0, \"Script running\");\n    }\n\n    touch_start(integer num)\n    {\n    }\n}"),
                     remoteClient.AgentId);
                 AssetService.Store(asset);
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 09c945b3e2..5b007e603f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
             Quaternion rotationOffset, Vector3 offsetPosition)
         {
-            m_name = "Primitive";
+            m_name = "Object";
 
             Rezzed = DateTime.UtcNow;
             _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@@ -1625,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes
             PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
             part.Shape = shape;
 
-            part.Name = "Primitive";
+            part.Name = "Object";
             part._ownerID = UUID.Random();
 
             return part;

From 3cd717d929d641b8e34d2212165af8d32fc8978e Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 29 Jun 2010 04:09:14 +0200
Subject: [PATCH 43/96] Comment the "Notecard saved" notification that pops up
 when a notecard is saved into a prim. Sl doesn't have it, and for good
 reason: It also happens on scripts in our version. Which is wrong. Better no
 message than a wrong one.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a2a8882c3b..e61132e41a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     if (part.Inventory.UpdateInventoryItem(itemInfo))
                     {
-                        remoteClient.SendAgentAlertMessage("Notecard saved", false);                        
+                        // remoteClient.SendAgentAlertMessage("Notecard saved", false);                        
                         part.GetProperties(remoteClient);
                     }
                 }

From 9fde9085a0fcd2e78b01724e0b7e826156d23f53 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 29 Jun 2010 02:07:10 -0700
Subject: [PATCH 44/96] Bug fix in HG standalone: wrong handler in the in
 module. Fixed a few broken comments in InventoryAccessModule.

---
 .../InventoryAccess/InventoryAccessModule.cs        | 13 ++-----------
 .../Inventory/InventoryServiceInConnectorModule.cs  |  2 +-
 .../Handlers/Inventory/XInventoryInConnector.cs     |  4 ++++
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 3035d889e7..12b6aa0ba3 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -286,23 +286,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     // Deleting someone else's item
                     //
-
-
                     if (remoteClient == null ||
                         objectGroup.OwnerID != remoteClient.AgentId)
                     {
-                        // Folder skeleton may not be loaded and we
-                        // have to wait for the inventory to find
-                        // the destination folder
-                        //
+
                         folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
                     }
                     else
                     {
-                        // Assume inventory skeleton was loaded during login
-                        // and all folders can be found
-                        //
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                         folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
                     }
                 }
                 else if (action == DeRezAction.Return)
@@ -332,7 +324,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (folder == null) // None of the above
                 {
-                    //folder = userInfo.RootFolder.FindFolder(folderID);
                     folder = new InventoryFolderBase(folderID);
 
                     if (folder == null) // Nowhere to put it
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index ae03cdf9f6..209cf0d3c2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
 
                 Object[] args = new Object[] { m_Config, MainServer.Instance, "HGInventoryService" };
 
-                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector", args);
+                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:XInventoryInConnector", args);
             }
         }
 
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 6e580f1744..ac6a3ab929 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Server.Handlers.Asset
 {
     public class XInventoryInConnector : ServiceConnector
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IInventoryService m_InventoryService;
         private string m_ConfigName = "InventoryService";
 
@@ -53,6 +55,8 @@ namespace OpenSim.Server.Handlers.Asset
             if (configName != String.Empty)
                 m_ConfigName = configName;
 
+            m_log.DebugFormat("[XInventoryInConnector]: Starting with config name {0}", m_ConfigName);
+
             IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));

From 08e338979062268aa6c82fbe83903de5bcd77f30 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 29 Jun 2010 04:38:15 -0700
Subject: [PATCH 45/96] Buglet fix in HG inventory. Make sure that
 GetRootFolder for non-HG xinventory is the folder "My Inventory". Also
 changed the Suitcase folder name to "My Suitcase".

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 +-
 OpenSim/Services/InventoryService/HGInventoryService.cs  | 4 ++--
 OpenSim/Services/InventoryService/XInventoryService.cs   | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 2ab46aa33f..58c396cc2a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return ret;
         }
 
-        public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
+        public override UUID DeleteToInventory(DeRezAction action, UUID folderID,
                 SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
             UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);
diff --git a/OpenSim/Services/InventoryService/HGInventoryService.cs b/OpenSim/Services/InventoryService/HGInventoryService.cs
index 061effe694..6e6b019f75 100644
--- a/OpenSim/Services/InventoryService/HGInventoryService.cs
+++ b/OpenSim/Services/InventoryService/HGInventoryService.cs
@@ -108,13 +108,13 @@ namespace OpenSim.Services.InventoryService
             // Warp! Root folder for travelers
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "folderName"},
-                    new string[] { principalID.ToString(), "Suitcase" });
+                    new string[] { principalID.ToString(), "My Suitcase" });
 
             if (folders.Length > 0)
                 return ConvertToOpenSim(folders[0]);
             
             // make one
-            XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "Suitcase");
+            XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "My Suitcase");
             return ConvertToOpenSim(suitcase);
         }
 
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index af831fdf94..f48bf60f08 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -200,7 +200,14 @@ namespace OpenSim.Services.InventoryService
             if (folders.Length == 0)
                 return null;
 
-            return ConvertToOpenSim(folders[0]);
+            XInventoryFolder root = null;
+            foreach (XInventoryFolder folder in folders)
+                if (folder.folderName == "My Inventory")
+                    root = folder;
+            if (folders == null) // oops
+                root = folders[0];
+
+            return ConvertToOpenSim(root);
         }
 
         public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)

From cf15558c9ec7dcee3e5d4ff7bab57171450c3eec Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 29 Jun 2010 06:25:12 -0700
Subject: [PATCH 46/96] This file wants to be committed.

---
 .../Shared/Api/Implementation/LSL_Api.cs      | 140 +++++++++---------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dc34e1c20d..712bd7d383 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -703,76 +703,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Rotation llRotBetween(LSL_Vector a, LSL_Vector b)
         {
-            //A and B should both be normalized
-            m_host.AddScriptLPS(1);
-            LSL_Rotation rotBetween;
-            // Check for zero vectors. If either is zero, return zero rotation. Otherwise,
-            // continue calculation.
-            if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f))
-            {
-                rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-            }
-            else
-            {
-                a = LSL_Vector.Norm(a);
-                b = LSL_Vector.Norm(b);
-                double dotProduct = LSL_Vector.Dot(a, b);
-                // There are two degenerate cases possible. These are for vectors 180 or
-                // 0 degrees apart. These have to be detected and handled individually.
-                //
-                // Check for vectors 180 degrees apart.
-                // A dot product of -1 would mean the angle between vectors is 180 degrees.
-                if (dotProduct < -0.9999999f)
-                {
-                    // First assume X axis is orthogonal to the vectors.
-                    LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f);
-                    orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a));
-                    // Check for near zero vector. A very small non-zero number here will create
-                    // a rotation in an undesired direction.
-                    if (LSL_Vector.Mag(orthoVector) > 0.0001)
-                    {
-                        rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f);
-                    }
-                    // If the magnitude of the vector was near zero, then assume the X axis is not
-                    // orthogonal and use the Z axis instead.
-                    else
-                    {
-                        // Set 180 z rotation.
-                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
-                    }
-                }
-                // Check for parallel vectors.
-                // A dot product of 1 would mean the angle between vectors is 0 degrees.
-                else if (dotProduct > 0.9999999f)
-                {
-                    // Set zero rotation.
-                    rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-                }
-                else
-                {
-                    // All special checks have been performed so get the axis of rotation.
-                    LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
-                    // Quarternion s value is the length of the unit vector + dot product.
-                    double qs = 1.0 + dotProduct;
-                    rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
-                    // Normalize the rotation.
-                    double mag = LSL_Rotation.Mag(rotBetween);
-                    // We shouldn't have to worry about a divide by zero here. The qs value will be
-                    // non-zero because we already know if we're here, then the dotProduct is not -1 so
-                    // qs will not be zero. Also, we've already handled the input vectors being zero so the
-                    // crossProduct vector should also not be zero.
-                    rotBetween.x = rotBetween.x / mag;
-                    rotBetween.y = rotBetween.y / mag;
-                    rotBetween.z = rotBetween.z / mag;
-                    rotBetween.s = rotBetween.s / mag;
-                    // Check for undefined values and set zero rotation if any found. This code might not actually be required
-                    // any longer since zero vectors are checked for at the top.
-                    if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
-                    {
-                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-                    }
-                }
-            }
+            //A and B should both be normalized
+            m_host.AddScriptLPS(1);
+            LSL_Rotation rotBetween;
+            // Check for zero vectors. If either is zero, return zero rotation. Otherwise,
+            // continue calculation.
+            if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f))
+            {
+                rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+            }
+            else
+            {
+                a = LSL_Vector.Norm(a);
+                b = LSL_Vector.Norm(b);
+                double dotProduct = LSL_Vector.Dot(a, b);
+                // There are two degenerate cases possible. These are for vectors 180 or
+                // 0 degrees apart. These have to be detected and handled individually.
+                //
+                // Check for vectors 180 degrees apart.
+                // A dot product of -1 would mean the angle between vectors is 180 degrees.
+                if (dotProduct < -0.9999999f)
+                {
+                    // First assume X axis is orthogonal to the vectors.
+                    LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f);
+                    orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a));
+                    // Check for near zero vector. A very small non-zero number here will create
+                    // a rotation in an undesired direction.
+                    if (LSL_Vector.Mag(orthoVector) > 0.0001)
+                    {
+                        rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f);
+                    }
+                    // If the magnitude of the vector was near zero, then assume the X axis is not
+                    // orthogonal and use the Z axis instead.
+                    else
+                    {
+                        // Set 180 z rotation.
+                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
+                    }
+                }
+                // Check for parallel vectors.
+                // A dot product of 1 would mean the angle between vectors is 0 degrees.
+                else if (dotProduct > 0.9999999f)
+                {
+                    // Set zero rotation.
+                    rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+                }
+                else
+                {
+                    // All special checks have been performed so get the axis of rotation.
+                    LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
+                    // Quarternion s value is the length of the unit vector + dot product.
+                    double qs = 1.0 + dotProduct;
+                    rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
+                    // Normalize the rotation.
+                    double mag = LSL_Rotation.Mag(rotBetween);
+                    // We shouldn't have to worry about a divide by zero here. The qs value will be
+                    // non-zero because we already know if we're here, then the dotProduct is not -1 so
+                    // qs will not be zero. Also, we've already handled the input vectors being zero so the
+                    // crossProduct vector should also not be zero.
+                    rotBetween.x = rotBetween.x / mag;
+                    rotBetween.y = rotBetween.y / mag;
+                    rotBetween.z = rotBetween.z / mag;
+                    rotBetween.s = rotBetween.s / mag;
+                    // Check for undefined values and set zero rotation if any found. This code might not actually be required
+                    // any longer since zero vectors are checked for at the top.
+                    if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
+                    {
+                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+                    }
+                }
+            }
             return rotBetween;
         }
 

From c607e6f3b8de5f04e0c9114893b11256fa922272 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 29 Jun 2010 20:28:48 +0100
Subject: [PATCH 47/96] Revert "don't report the null uuid as a missing asset
 on saving oars/iars"

This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea.

This change led to infinite timeout since the expected number of assets no longer matched requests.
Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
---
 .../Region/CoreModules/World/Archiver/AssetsRequest.cs    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 4d360f6be5..a1451ce705 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -134,8 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             
             foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids)
             {
-                if (kvp.Key != UUID.Zero)
-                    m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
+                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
             }
 
             m_requestCallbackTimer.Enabled = true;
@@ -270,7 +269,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}{1}", e.Message, e.StackTrace);
+                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
             }
         }
 
@@ -286,8 +285,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[ARCHIVER]: Terminating archive creation since asset requester callback failed with {0}{1}", 
-                    e.Message, e.StackTrace);
+                    "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e);
             }
         }
     }

From 5964084d25ab534e0eb888b44fefea8ee3e51a7d Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Tue, 29 Jun 2010 20:36:17 +0100
Subject: [PATCH 48/96] Fix a nullref on autoreturn

---
 .../Framework/Scenes/Scene.Inventory.cs       | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9278164808..f9da341ba9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1574,13 +1574,25 @@ namespace OpenSim.Region.Framework.Scenes
                 // for when deleting the object from it
                 ForceSceneObjectBackup(grp);
 
-                if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
-                    permissionToTakeCopy = false;
-                if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
-                    permissionToTake = false;
+                if (remoteClient == null)
+                {
+                    // Autoreturn has a null client. Nothing else does. So
+                    // allow only returns
+                    if (action != DeRezAction.Return)
+                        return;
 
-                if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
-                    permissionToDelete = false;
+                    permissionToTakeCopy = false;
+                }
+                else
+                {
+                    if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                        permissionToTakeCopy = false;
+                    if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
+                        permissionToTake = false;
+
+                    if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
+                        permissionToDelete = false;
+                }
 
             }
 

From 94cb6fc916e1bd039f2b59214e68a0b3c4847445 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 29 Jun 2010 18:54:31 +0100
Subject: [PATCH 49/96] stop exceptions in setting and getting state from
 propogating since they aren't fatal to operations

this will hopefully stop "save oar" from failing if a script asset is corrupt
---
 .../Scenes/SceneObjectPartInventory.cs        | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3a8f168e74..a6067ad1e8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
             foreach (IScriptModule e in engines)
             {
                 if (e != null)
-                {
+                {                    
                     ArrayList errors = e.GetScriptErrors(itemID);
                     foreach (Object line in errors)
                         ret.Add(line);
@@ -356,14 +356,26 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
                 }
+                
                 foreach (IScriptModule e in engines)
                 {
                     if (e != null)
                     {
-                        if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
-                            break;
+                        // Stop an exception in setting saved state from propogating since this is not fatal.
+                        try
+                        {
+                            if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
+                                break;
+                        }
+                        catch (Exception ex)
+                        {
+                            m_log.WarnFormat(
+                                "[PRIM INVENTORY]: Could not set script state for old key {0}, new key {1} in prim {2} {3}.  Exception {4}{5}", 
+                                oldID, newID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
+                        }                        
                     }
                 }
+                
                 m_part.ParentGroup.m_savedScriptState.Remove(oldID);
             }
         }
@@ -1021,12 +1033,23 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             if (e != null)
                             {
-                                string n = e.GetXMLState(item.ItemID);
-                                if (n != String.Empty)
+                                // Stop any exception from the script engine from propogating since setting state
+                                // isn't essential.
+                                try
                                 {
-                                    if (!ret.ContainsKey(item.ItemID))
-                                        ret[item.ItemID] = n;
-                                    break;
+                                    string n = e.GetXMLState(item.ItemID);
+                                    if (n != String.Empty)
+                                    {
+                                        if (!ret.ContainsKey(item.ItemID))
+                                            ret[item.ItemID] = n;
+                                        break;
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    m_log.WarnFormat(
+                                        "[PRIM INVENTORY]: Could not retrieve script state for item {0} {1} in prim {2} {3}.  Exception {4}{5}", 
+                                        item.Name, item.ItemID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
                                 }
                             }
                         }

From 6701fc2ffa426912fe7a4b208eaeec6d2defce15 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Tue, 29 Jun 2010 21:50:52 +0100
Subject: [PATCH 50/96] Fix the XML serializationt to provide an empty script
 state element if the script hasn't yet saved state, or can't save state
 because of a loop

---
 .../Region/ScriptEngine/XEngine/XEngine.cs    | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 61a208822d..471569006b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1274,9 +1274,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             string xml = instance.GetXMLState();
 
             XmlDocument sdoc = new XmlDocument();
-            sdoc.LoadXml(xml);
-            XmlNodeList rootL = sdoc.GetElementsByTagName("ScriptState");
-            XmlNode rootNode = rootL[0];
+            bool loadedState = true;
+            try
+            {
+                sdoc.LoadXml(xml);
+            }
+            catch (System.Xml.XmlException e)
+            {
+                loadedState = false;
+            }
+
+            XmlNodeList rootL = null;
+            XmlNode rootNode = null;
+            if (loadedState)
+            {
+                rootL = sdoc.GetElementsByTagName("ScriptState");
+                rootNode = rootL[0];
+            }
 
             // Create <State UUID="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx">
             XmlDocument doc = new XmlDocument();
@@ -1292,8 +1306,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             stateData.Attributes.Append(engineName);
             doc.AppendChild(stateData);
 
+            XmlNode xmlstate = null;
+
             // Add <ScriptState>...</ScriptState>
-            XmlNode xmlstate = doc.ImportNode(rootNode, true);
+            if (loadedState)
+            {
+                xmlstate = doc.ImportNode(rootNode, true);
+            }
+            else
+            {
+                xmlstate = doc.CreateElement("", "ScriptState", "");
+            }
+
             stateData.AppendChild(xmlstate);
 
             string assemName = instance.GetAssemblyName();

From d06b977ed1a0472fbf15da0d4d7ae68b40936fb8 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 29 Jun 2010 14:21:48 -0700
Subject: [PATCH 51/96] Remove the override from DeletToInventory in
 HGInventoryAccessModule. This may be causing the infinite loop, not sure.

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 58c396cc2a..b0555daa3a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return ret;
         }
 
-        public override UUID DeleteToInventory(DeRezAction action, UUID folderID,
+        // DO NOT OVERRIDE THIS METHOD
+        public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
                 SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
             UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);

From be0af01061f24b714022a72573374c2178a94251 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 29 Jun 2010 23:43:38 +0100
Subject: [PATCH 52/96] Revert "stop exceptions in setting and getting state
 from propogating since they aren't fatal to operations"

This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445.
---
 .../Scenes/SceneObjectPartInventory.cs        | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index a6067ad1e8..3a8f168e74 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
             foreach (IScriptModule e in engines)
             {
                 if (e != null)
-                {                    
+                {
                     ArrayList errors = e.GetScriptErrors(itemID);
                     foreach (Object line in errors)
                         ret.Add(line);
@@ -356,26 +356,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
                 }
-                
                 foreach (IScriptModule e in engines)
                 {
                     if (e != null)
                     {
-                        // Stop an exception in setting saved state from propogating since this is not fatal.
-                        try
-                        {
-                            if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
-                                break;
-                        }
-                        catch (Exception ex)
-                        {
-                            m_log.WarnFormat(
-                                "[PRIM INVENTORY]: Could not set script state for old key {0}, new key {1} in prim {2} {3}.  Exception {4}{5}", 
-                                oldID, newID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
-                        }                        
+                        if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
+                            break;
                     }
                 }
-                
                 m_part.ParentGroup.m_savedScriptState.Remove(oldID);
             }
         }
@@ -1033,23 +1021,12 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             if (e != null)
                             {
-                                // Stop any exception from the script engine from propogating since setting state
-                                // isn't essential.
-                                try
+                                string n = e.GetXMLState(item.ItemID);
+                                if (n != String.Empty)
                                 {
-                                    string n = e.GetXMLState(item.ItemID);
-                                    if (n != String.Empty)
-                                    {
-                                        if (!ret.ContainsKey(item.ItemID))
-                                            ret[item.ItemID] = n;
-                                        break;
-                                    }
-                                }
-                                catch (Exception ex)
-                                {
-                                    m_log.WarnFormat(
-                                        "[PRIM INVENTORY]: Could not retrieve script state for item {0} {1} in prim {2} {3}.  Exception {4}{5}", 
-                                        item.Name, item.ItemID, m_part.Name, m_part.UUID, ex.Message, ex.StackTrace);
+                                    if (!ret.ContainsKey(item.ItemID))
+                                        ret[item.ItemID] = n;
+                                    break;
                                 }
                             }
                         }

From 8dc7c0849eecaea09ce3571bab28b44c17bb3743 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Tue, 29 Jun 2010 23:18:48 -0700
Subject: [PATCH 53/96] The other half of the asset fix. Implement an
 exponentially incrementing retry timer for asset upload failures. Total queue
 time in the ballpark of 24 hours, which should be a reasonable time for any
 grid admin to get their asset service back online. This should stop lost
 assets.

---
 OpenSim/Framework/AssetBase.cs                |  8 ++
 .../Connectors/Asset/AssetServiceConnector.cs | 99 ++++++++++++++++---
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 53d28be088..98fa84683b 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -60,6 +60,8 @@ namespace OpenSim.Framework
         /// </summary>
         private AssetMetadata m_metadata;
 
+        private int m_uploadAttempts;
+
         // This is needed for .NET serialization!!!
         // Do NOT "Optimize" away!
         public AssetBase()
@@ -197,6 +199,12 @@ 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>
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 65b3537041..ae600bb6e7 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -30,6 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Timers;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -48,7 +49,9 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
         private IImprovedAssetCache m_Cache = null;
-
+        private int m_retryCounter;
+        private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
+        private Timer m_retryTimer;
         public AssetServicesConnector()
         {
         }
@@ -85,6 +88,55 @@ namespace OpenSim.Services.Connectors
             MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset",
                                           "dump asset <id> <file>",
                                           "dump one cached asset", HandleDumpAsset);
+
+            m_retryTimer = new Timer();
+            m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
+            m_retryTimer.Interval = 60000;
+        }
+
+        protected void retryCheck(object source, ElapsedEventArgs e)
+        {
+            m_retryCounter++;
+            if (m_retryCounter > 60) m_retryCounter -= 60;
+            List<int> keys = new List<int>();
+            foreach (int a in m_retryQueue.Keys)
+            {
+                keys.Add(a);
+            }
+            foreach (int a in keys)
+            {
+                //We exponentially fall back on frequency until we reach one attempt per hour
+                //The net result is that we end up in the queue for roughly 24 hours..
+                //24 hours worth of assets could be a lot, so the hope is that the region admin
+                //will have gotten the asset connector back online quickly!
+
+                int timefactor = a ^ 2; 
+                if (timefactor > 60)
+                {
+                    timefactor = 60;
+                }
+
+                //First, find out if we care about this timefactor
+                if (timefactor % a == 0)
+                {
+                    //Yes, we do!   
+                    List<AssetBase> retrylist = m_retryQueue[a];
+                    m_retryQueue.Remove(a);
+
+                    foreach(AssetBase ass in retrylist)
+                    {
+                        Store(ass); //Store my ass. This function will put it back in the dictionary if it fails
+                    }
+                }
+            }
+
+            if (m_retryQueue.Count == 0)
+            {
+                //It might only be one tick per minute, but I have
+                //repented and abandoned my wasteful ways
+                m_retryCounter = 0;
+                m_retryTimer.Stop();
+            }
         }
 
         protected void SetCache(IImprovedAssetCache cache)
@@ -222,20 +274,45 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message);
+                newID = UUID.Zero.ToString();
             }
 
-            if (newID != String.Empty)
+            if (newID == UUID.Zero.ToString())
             {
-                // Placing this here, so that this work with old asset servers that don't send any reply back
-                // SynchronousRestObjectRequester returns somethins that is not an empty string
-                if (newID != null)
-                    asset.ID = newID;
-
-                if (m_Cache != null)
-                    m_Cache.Cache(asset);
+                //The asset upload failed, put it in a queue for later
+                asset.UploadAttempts++;
+                if (asset.UploadAttempts > 30)
+                {
+                    //By this stage we've been in the queue for a good few hours;
+                    //We're going to drop the asset.
+                    m_log.ErrorFormat("[Assets] Dropping asset {0} - Upload has been in the queue for too long.", asset.ID.ToString());
+                }
+                else
+                {
+                    if (!m_retryQueue.ContainsKey(asset.UploadAttempts))
+                    {
+                        m_retryQueue.Add(asset.UploadAttempts, new List<AssetBase>());
+                    }
+                    List<AssetBase> m_queue = m_retryQueue[asset.UploadAttempts];
+                    m_queue.Add(asset);
+                    m_log.WarnFormat("[Assets] Upload failed: {0} - Requeuing asset for another run.", asset.ID.ToString());
+                    m_retryTimer.Start();
+                }
             }
-            return newID;
+            else
+            {
+                if (newID != String.Empty)
+                {
+                    // Placing this here, so that this work with old asset servers that don't send any reply back
+                    // SynchronousRestObjectRequester returns somethins that is not an empty string
+                    if (newID != null)
+                        asset.ID = newID;
+
+                    if (m_Cache != null)
+                        m_Cache.Cache(asset);
+                }
+            }
+            return asset.ID;
         }
 
         public bool UpdateContent(string id, byte[] data)

From b6264e60d39b12d03e3d5e57eb07fa7a5d1a2852 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Wed, 30 Jun 2010 06:35:22 -0700
Subject: [PATCH 54/96] Removed opportunity for exception in BaseHttpServer.
 (mantis #4825)

---
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index bc31815d8a..d261678159 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -283,6 +283,10 @@ namespace OpenSim.Server.Handlers.Simulation
             if (m_SimulationService == null)
             {
                 m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless.");
+                responsedata["content_type"] = "application/json";
+                responsedata["int_response_code"] = HttpStatusCode.NotImplemented;
+                responsedata["str_response_string"] = string.Empty;
+
                 return;
             }
 

From eb30b60e529c21568d4f39bff6420de1274459ef Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 30 Jun 2010 19:54:35 +0100
Subject: [PATCH 55/96] minor: comment out high volume texture serving module
 debug message

---
 OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 75efb799c1..8aa87fddee 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                     end = Utils.Clamp(end, 1, texture.Data.Length);
                     start = Utils.Clamp(start, 0, end - 1);
 
-                    m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
+                    //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
 
                     if (end - start < texture.Data.Length)
                         response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;

From 1db2921782c4d16e3a1be09de3ef499094d947f2 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 30 Jun 2010 21:25:39 +0100
Subject: [PATCH 56/96] Fix scripts in rezzed objects not starting (Mantis
 #4775)

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 471569006b..808cf8280c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -488,6 +488,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             if (stateSource == (int)StateSource.ScriptedRez)
             {
+                lock (m_CompileDict)
+                {
+                    m_CompileDict[itemID] = 0;
+                }
+
                 DoOnRezScript(parms);
             }
             else

From 8326f36cda844b7d5a4530eb095b605cbe47d9e1 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 30 Jun 2010 19:54:35 +0100
Subject: [PATCH 57/96] minor: comment out high volume texture serving module
 debug message

---
 OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 75efb799c1..8aa87fddee 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                     end = Utils.Clamp(end, 1, texture.Data.Length);
                     start = Utils.Clamp(start, 0, end - 1);
 
-                    m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
+                    //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
 
                     if (end - start < texture.Data.Length)
                         response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;

From 3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 1 Jul 2010 16:11:10 +0200
Subject: [PATCH 58/96] Avoid a spurious error message when taking a friend's
 no copy item

---
 .../Framework/Scenes/Scene.Inventory.cs       |  9 +++-
 .../Shared/Api/Implementation/LSL_Api.cs      | 42 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0ac427ff6a..167e166b06 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1604,8 +1604,15 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                    if (action == DeRezAction.TakeCopy)
+                    {
+                        if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                            permissionToTakeCopy = false;
+                    }
+                    else
+                    {
                         permissionToTakeCopy = false;
+                    }
                     if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
                         permissionToTake = false;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fb191e6a5e..d49bbb2d1c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9829,19 +9829,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llXorBase64StringsCorrect(string str1, string str2)
         {
             m_host.AddScriptLPS(1);
-            string ret = String.Empty;
-            string src1 = llBase64ToString(str1);
-            string src2 = llBase64ToString(str2);
-            int c = 0;
-            for (int i = 0; i < src1.Length; i++)
-            {
-                ret += (char) (src1[i] ^ src2[c]);
 
-                c++;
-                if (c >= src2.Length)
-                    c = 0;
+            if (str1 == String.Empty)
+                return String.Empty;
+            if (str2 == String.Empty)
+                return str1;
+
+            byte[] data1 = Convert.FromBase64String(str1);
+            byte[] data2 = Convert.FromBase64String(str2);
+
+            byte[] d2 = new Byte[data1.Length];
+            int pos = 0;
+            
+            if (data1.Length <= data2.Length)
+            {
+                Array.Copy(data2, 0, d2, 0, data1.Length);
             }
-            return llStringToBase64(ret);
+            else
+            {
+                while (pos < data1.Length)
+                {
+                    int len = data1.Length - pos;
+                    if (len > data2.Length)
+                        len = data2.Length;
+
+                    Array.Copy(data2, 0, d2, pos, len);
+                    pos += len;
+                }
+            }
+
+            for (pos = 0 ; pos < data1.Length ; pos++ )
+                data1[pos] ^= d2[pos];
+
+            return Convert.ToBase64String(data1);
         }
 
         public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)

From d5cbe4cb75a40a5b98d92d7fac504943edf428a1 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 1 Jul 2010 16:40:26 +0200
Subject: [PATCH 59/96] Remove trailing slash from HTTP URLs to be compatible
 with SL

---
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9b565ed85b..ab27da9156 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString() + "/";
+                string uri = "/lslhttp/" + urlcode.ToString();
                
                 m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll,
                         new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,

From 3d5d44279b99e58cb4f2db3532df522ad3b5cccf Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 1 Jul 2010 17:06:29 +0200
Subject: [PATCH 60/96] ANother stab at LSL compatibility

---
 OpenSim/Framework/ParcelMediaCommandEnum.cs                     | 2 +-
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs       | 2 +-
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 93c41ecd4d..e714382e66 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -27,7 +27,7 @@
 
 namespace OpenSim.Framework
 {
-    public enum ParcelMediaCommandEnum
+    public enum ParcelMediaCommandEnum : int
     {
         Stop = 0,
         Pause = 1,
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index ab27da9156..f8cb41415c 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -142,7 +142,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;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d49bbb2d1c..e22668278c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9394,7 +9394,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (aList.Data[i] != null)
                 {
-                    switch ((ParcelMediaCommandEnum) aList.Data[i])
+                    switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
                     {
                         case ParcelMediaCommandEnum.Url:
                             list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));

From 1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Thu, 1 Jul 2010 08:48:02 -0700
Subject: [PATCH 61/96] Catch newid == null which is what happens if the asset
 service is offline (seems a connection failure does not throw an exception)

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index ae600bb6e7..bc56963991 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -271,6 +271,10 @@ namespace OpenSim.Services.Connectors
             {
                 newID = SynchronousRestObjectRequester.
                         MakeRequest<AssetBase, string>("POST", uri, asset);
+                if (newID == null)
+                {
+                    newID = UUID.Zero.ToString();
+                }
             }
             catch (Exception e)
             {

From 38384cc79c04fe9b97070104283be02511c4e12c Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Thu, 1 Jul 2010 08:52:30 -0700
Subject: [PATCH 62/96] Report asset upload success if it has previously failed

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index bc56963991..bbccef9788 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -305,6 +305,10 @@ namespace OpenSim.Services.Connectors
             }
             else
             {
+                if (asset.UploadAttempts > 0)
+                {
+                    m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString()));
+                }
                 if (newID != String.Empty)
                 {
                     // Placing this here, so that this work with old asset servers that don't send any reply back

From b38a22506b31041e29a1271db32046efcb14af4e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Thu, 1 Jul 2010 08:55:52 -0700
Subject: [PATCH 63/96] Fix build break

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index bbccef9788..94acd6cc66 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Services.Connectors
             {
                 if (asset.UploadAttempts > 0)
                 {
-                    m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString()));
+                    m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
                 }
                 if (newID != String.Empty)
                 {

From 071d601dcbd812bf2e3b163a53323ab5e00a315e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Thu, 1 Jul 2010 09:46:57 -0700
Subject: [PATCH 64/96] Cache all assets on upload so that the client can still
 retrieve the asset if it enters a retry queue

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 94acd6cc66..e63dd50d64 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -256,11 +256,10 @@ namespace OpenSim.Services.Connectors
 
         public string Store(AssetBase asset)
         {
+            if (m_Cache != null)
+                m_Cache.Cache(asset);
             if (asset.Temporary || asset.Local)
             {
-                if (m_Cache != null)
-                    m_Cache.Cache(asset);
-
                 return asset.ID;
             }
 

From 54d7f6ef43991e7cc9ee1bbbe7e98003b9d957f3 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 1 Jul 2010 21:34:53 +0100
Subject: [PATCH 65/96] Add region name on the end of script startup debug
 messages

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 808cf8280c..bc5df11778 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -770,8 +770,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                   item.Name, startParam, postOnRez,
                                                   stateSource, m_MaxScriptQueue);
                     
-                    m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
-                            part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
+                    m_log.DebugFormat(
+                        "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
+                        part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 
+                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
 
                     if (presence != null)
                     {

From 60c15d7c283a7ded6d7e7b6c40b77b2a6b7218f2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 03:05:40 +0200
Subject: [PATCH 66/96] Fix a dumb little sign error that makes a LSL wiki
 example fail

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 212dbe3a1b..59279735f0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -663,13 +663,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 Object[] ret;
 
                 if (start < 0)
-                    start=m_data.Length-start;
+                    start=m_data.Length+start;
 
                 if (start < 0)
                     start=0;
 
                 if (end < 0)
-                    end=m_data.Length-end;
+                    end=m_data.Length+end;
                 if (end < 0)
                     end=0;
 

From 848623eea5b8ee09681e21231258956e0ff41599 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 03:05:40 +0200
Subject: [PATCH 67/96] Fix a dumb little sign error that makes a LSL wiki
 example fail

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 1ea52c5c4e..941c7619f6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -663,13 +663,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 Object[] ret;
 
                 if (start < 0)
-                    start=m_data.Length-start;
+                    start=m_data.Length+start;
 
                 if (start < 0)
                     start=0;
 
                 if (end < 0)
-                    end=m_data.Length-end;
+                    end=m_data.Length+end;
                 if (end < 0)
                     end=0;
 

From a7c4cb95aade11c302c9d1113f720467233b8600 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 04:26:55 +0200
Subject: [PATCH 68/96] Fox another scripting nasty. Stuff no system.string
 objects into lists

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e22668278c..11d7c2bdf0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5247,7 +5247,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ',':
                         if (parens == 0)
                         {
-                            result.Add(src.Substring(start,length).Trim());
+                            result.Add(new LSL_String(src.Substring(start,length).Trim()));
                             start += length+1;
                             length = 0;
                         }

From beb5259cd1ae11464e2affaa19788361979fbd0e Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 04:51:31 +0200
Subject: [PATCH 69/96] Remove GetEconomyData and the economy data structure
 (unused)

---
 OpenSim/Framework/IMoneyModule.cs             | 21 -------------------
 .../World/MoneyModule/SampleMoneyModule.cs    | 21 -------------------
 2 files changed, 42 deletions(-)

diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 3480960aa1..17e74a05cc 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -43,27 +43,6 @@ namespace OpenSim.Framework
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
 
-        EconomyData GetEconomyData();
-
         event ObjectPaid OnObjectPaid;
     }
-
-    public struct EconomyData
-    {
-        public int ObjectCapacity;
-        public int ObjectCount;
-        public int PriceEnergyUnit;
-        public int PriceGroupCreate;
-        public int PriceObjectClaim;
-        public float PriceObjectRent;
-        public float PriceObjectScaleFactor;
-        public int PriceParcelClaim;
-        public float PriceParcelClaimFactor;
-        public int PriceParcelRent;
-        public int PricePublicObjectDecay;
-        public int PricePublicObjectDelete;
-        public int PriceRentLight;
-        public int PriceUpload;
-        public int TeleportMinPrice;
-    }
 }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b9a75cc198..e070077556 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -268,27 +268,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         }
 
-        public EconomyData GetEconomyData()
-        {
-            EconomyData edata = new EconomyData();
-            edata.ObjectCapacity = ObjectCapacity;
-            edata.ObjectCount = ObjectCount;
-            edata.PriceEnergyUnit = PriceEnergyUnit;
-            edata.PriceGroupCreate = PriceGroupCreate;
-            edata.PriceObjectClaim = PriceObjectClaim;
-            edata.PriceObjectRent = PriceObjectRent;
-            edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
-            edata.PriceParcelClaim = PriceParcelClaim;
-            edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
-            edata.PriceParcelRent = PriceParcelRent;
-            edata.PricePublicObjectDecay = PricePublicObjectDecay;
-            edata.PricePublicObjectDelete = PricePublicObjectDelete;
-            edata.PriceRentLight = PriceRentLight;
-            edata.PriceUpload = PriceUpload;
-            edata.TeleportMinPrice = TeleportMinPrice;
-            return edata;
-        }
-
         private void GetClientFunds(IClientAPI client)
         {
             CheckExistAndRefreshFunds(client.AgentId);

From e328c233554913393cb08fd771b64f2dd1b3de60 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Fri, 2 Jul 2010 04:03:35 +0100
Subject: [PATCH 70/96] Add MapTileURL to robust to supply the url needed by
 snowglobe

---
 .../LLLoginService/LLLoginResponse.cs         | 19 ++++++++++++++++++-
 .../Services/LLLoginService/LLLoginService.cs |  4 +++-
 bin/Robust.ini.example                        |  3 +++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 54d53fb2a4..866e3a3f69 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -170,6 +170,9 @@ namespace OpenSim.Services.LLLoginService
         private string firstname;
         private string lastname;
 
+        // Web map
+        private string mapTileURL;
+
         // Error Flags
         private string errorReason;
         private string errorMessage;
@@ -218,7 +221,7 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -234,6 +237,7 @@ namespace OpenSim.Services.LLLoginService
             Message = message;
             BuddList = ConvertFriendListItem(friendsList);
             StartLocation = where;
+            MapTileURL = mapTileURL;
 
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -405,6 +409,7 @@ namespace OpenSim.Services.LLLoginService
             InitialOutfitHash["folder_name"] = "Nightclub Female";
             InitialOutfitHash["gender"] = "female";
             initialOutfit.Add(InitialOutfitHash);
+            mapTileURL = String.Empty;
         }
 
 
@@ -468,6 +473,9 @@ namespace OpenSim.Services.LLLoginService
                 responseData["region_x"] = (Int32)(RegionX);
                 responseData["region_y"] = (Int32)(RegionY);
 
+                if (mapTileURL != String.Empty)
+                    responseData["map-server-url"] = mapTileURL;
+
                 if (m_buddyList != null)
                 {
                     responseData["buddy-list"] = m_buddyList.ToArray();
@@ -564,6 +572,9 @@ namespace OpenSim.Services.LLLoginService
                 map["region_x"] = OSD.FromInteger(RegionX);
                 map["region_y"] = OSD.FromInteger(RegionY);
 
+                if (mapTileURL != String.Empty)
+                    map["map-server-url"] = OSD.FromString(mapTileURL);
+
                 if (m_buddyList != null)
                 {
                     map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -915,6 +926,12 @@ namespace OpenSim.Services.LLLoginService
             set { home = value; }
         }
 
+        public string MapTileURL
+        {
+            get { return mapTileURL; }
+            set { mapTileURL = value; }
+        }
+
         public string Message
         {
             get { return welcomeMessage; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 00fffff89f..f4e045ccb3 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -73,6 +73,7 @@ namespace OpenSim.Services.LLLoginService
         protected int m_MinLoginLevel;
         protected string m_GatekeeperURL;
         protected bool m_AllowRemoteSetLoginLevel;
+        protected string m_MapTileURL;
 
         IConfig m_LoginServerConfig;
 
@@ -100,6 +101,7 @@ namespace OpenSim.Services.LLLoginService
             m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
             m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
             m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
+            m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
 
             // These are required; the others aren't
             if (accountService == string.Empty || authService == string.Empty)
@@ -356,7 +358,7 @@ namespace OpenSim.Services.LLLoginService
                 // Finally, fill out the response and return it
                 //
                 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                 return response;
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8331db85b1..96dfc01add 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -134,6 +134,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
+    ; For snowglobe's web map
+    ; MapTileURL = "";
+
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.

From 9e0b562c6e98b3945551a113be24ebaf17bbff29 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 04:26:55 +0200
Subject: [PATCH 71/96] Fox another scripting nasty. Stuff no system.string
 objects into lists

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 712bd7d383..0a8d7cbe89 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4950,7 +4950,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case ',':
                         if (parens == 0)
                         {
-                            result.Add(src.Substring(start,length).Trim());
+                            result.Add(new LSL_String(src.Substring(start,length).Trim()));
                             start += length+1;
                             length = 0;
                         }

From d58b32735d7a72497a8ecf9c76aec9e63920ccbc Mon Sep 17 00:00:00 2001
From: dahlia <dahliaTrimble@gmail.removeme.com>
Date: Thu, 1 Jul 2010 20:50:24 -0700
Subject: [PATCH 72/96] add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784)

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9aadd70927..24432446c8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -95,6 +95,7 @@ what it is today.
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
+* Micheil Merlin
 * Mike Osias (IBM)
 * Mike Pitman (IBM)
 * mikkopa/_someone - RealXtend

From fda9d7b75e88f8308f5a05ae8f5476869e675a0b Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 04:51:31 +0200
Subject: [PATCH 73/96] Remove GetEconomyData and the economy data structure
 (unused)

---
 OpenSim/Framework/IMoneyModule.cs             | 21 -------------------
 .../World/MoneyModule/SampleMoneyModule.cs    | 21 -------------------
 2 files changed, 42 deletions(-)

diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 3480960aa1..17e74a05cc 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -43,27 +43,6 @@ namespace OpenSim.Framework
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
 
-        EconomyData GetEconomyData();
-
         event ObjectPaid OnObjectPaid;
     }
-
-    public struct EconomyData
-    {
-        public int ObjectCapacity;
-        public int ObjectCount;
-        public int PriceEnergyUnit;
-        public int PriceGroupCreate;
-        public int PriceObjectClaim;
-        public float PriceObjectRent;
-        public float PriceObjectScaleFactor;
-        public int PriceParcelClaim;
-        public float PriceParcelClaimFactor;
-        public int PriceParcelRent;
-        public int PricePublicObjectDecay;
-        public int PricePublicObjectDelete;
-        public int PriceRentLight;
-        public int PriceUpload;
-        public int TeleportMinPrice;
-    }
 }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b9a75cc198..e070077556 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -268,27 +268,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         }
 
-        public EconomyData GetEconomyData()
-        {
-            EconomyData edata = new EconomyData();
-            edata.ObjectCapacity = ObjectCapacity;
-            edata.ObjectCount = ObjectCount;
-            edata.PriceEnergyUnit = PriceEnergyUnit;
-            edata.PriceGroupCreate = PriceGroupCreate;
-            edata.PriceObjectClaim = PriceObjectClaim;
-            edata.PriceObjectRent = PriceObjectRent;
-            edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
-            edata.PriceParcelClaim = PriceParcelClaim;
-            edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
-            edata.PriceParcelRent = PriceParcelRent;
-            edata.PricePublicObjectDecay = PricePublicObjectDecay;
-            edata.PricePublicObjectDelete = PricePublicObjectDelete;
-            edata.PriceRentLight = PriceRentLight;
-            edata.PriceUpload = PriceUpload;
-            edata.TeleportMinPrice = TeleportMinPrice;
-            return edata;
-        }
-
         private void GetClientFunds(IClientAPI client)
         {
             CheckExistAndRefreshFunds(client.AgentId);

From c87e6a289c5ab93025bf03f486629fd5aa00aaaa Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 06:20:36 +0200
Subject: [PATCH 74/96] Clean up IMoneyModule and adjust the other modules to
 the changes

---
 OpenSim/Framework/Capabilities/Caps.cs        |  2 +-
 OpenSim/Framework/IMoneyModule.cs             | 11 ++++---
 .../AssetTransactionModule.cs                 |  2 +-
 .../Framework/Scenes/Scene.Inventory.cs       |  2 +-
 .../Avatar/XmlRpcGroups/GroupsModule.cs       |  4 +--
 .../World/MoneyModule/SampleMoneyModule.cs    | 33 +++++++++----------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 62a1e17f50..da953bbef0 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities
 
                     if (mm != null)
                     {
-                        if (!mm.UploadCovered(client))
+                        if (!mm.UploadCovered(client, mm.UploadCharge))
                         {
                             if (client != null)
                                 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 17e74a05cc..3d4873df0c 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -35,13 +35,14 @@ namespace OpenSim.Framework
         bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
                 int amount);
 
-        int GetBalance(IClientAPI client);
-        void ApplyUploadCharge(UUID agentID);
-        bool UploadCovered(IClientAPI client);
-        void ApplyGroupCreationCharge(UUID agentID);
-        bool GroupCreationCovered(IClientAPI client);
+        int GetBalance(UUID agentID);
+        bool UploadCovered(IClientAPI client, int amount);
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
+        void ApplyUploadCharge(UUID agentID, int amount, string text);
+
+        int UploadCharge { get; }
+        int GroupCreationCharge { get; }
 
         event ObjectPaid OnObjectPaid;
     }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 7e08ecf688..ae31050853 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
                 if (mm != null)
                 {
-                    if (!mm.UploadCovered(remoteClient))
+                    if (!mm.UploadCovered(remoteClient, mm.UploadCharge))
                     {
                         remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
                         return;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 167e166b06..489b8ca42c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
             IMoneyModule money=RequestModuleInterface<IMoneyModule>();
             if (money != null)
             {
-                money.ApplyUploadCharge(agentID);
+                money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
             }
 
             AddInventoryItem(agentID, item);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 56c0d985f1..3f15b69944 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -722,11 +722,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (money != null)
             {
                 // do the transaction, that is if the agent has got sufficient funds
-                if (!money.GroupCreationCovered(remoteClient)) {
+                if (!money.AmountCovered(remoteClient, money.GroupCreationCharge)) {
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient));
+                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
             }
             UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
 
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index e070077556..6f5ef9e9f8 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -108,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         public event ObjectPaid OnObjectPaid;
 
+        public int UploadCharge
+        {
+            get { return 0; }
+        }
+
+        public int GroupCreationCharge
+        {
+            get { return 0; }
+        }
+
         /// <summary>
         /// Startup
         /// </summary>
@@ -188,17 +198,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         // Please do not refactor these to be just one method
         // Existing implementations need the distinction
         //
-        public void ApplyUploadCharge(UUID agentID)
-        {
-        }
-
-        public void ApplyGroupCreationCharge(UUID agentID)
-        {
-        }
-
         public void ApplyCharge(UUID agentID, int amount, string text)
         {
         }
+        public void ApplyUploadCharge(UUID agentID, int amount, string text)
+        {
+        }
 
         public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
         {
@@ -769,7 +774,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
         }
 
-        public int GetBalance(IClientAPI client)
+        public int GetBalance(UUID agentID)
         {
             return 0;
         }
@@ -777,16 +782,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         // Please do not refactor these to be just one method
         // Existing implementations need the distinction
         //
-        public bool UploadCovered(IClientAPI client)
+        public bool UploadCovered(IClientAPI client, int amount)
         {
-            return AmountCovered(client, PriceUpload);
+            return true;
         }
-
-        public bool GroupCreationCovered(IClientAPI client)
-        {
-            return AmountCovered(client, PriceGroupCreate);
-        }
-
         public bool AmountCovered(IClientAPI client, int amount)
         {
             return true;

From e15f6905a53d686e3de9c2e16e842f3b735c3685 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 06:20:36 +0200
Subject: [PATCH 75/96] Clean up IMoneyModule and adjust the other modules to
 the changes

---
 OpenSim/Framework/Capabilities/Caps.cs        |  2 +-
 OpenSim/Framework/IMoneyModule.cs             | 11 ++++---
 .../AssetTransactionModule.cs                 |  2 +-
 .../Framework/Scenes/Scene.Inventory.cs       |  2 +-
 .../Avatar/XmlRpcGroups/GroupsModule.cs       |  4 +--
 .../World/MoneyModule/SampleMoneyModule.cs    | 33 +++++++++----------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 62a1e17f50..da953bbef0 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities
 
                     if (mm != null)
                     {
-                        if (!mm.UploadCovered(client))
+                        if (!mm.UploadCovered(client, mm.UploadCharge))
                         {
                             if (client != null)
                                 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 17e74a05cc..3d4873df0c 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -35,13 +35,14 @@ namespace OpenSim.Framework
         bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
                 int amount);
 
-        int GetBalance(IClientAPI client);
-        void ApplyUploadCharge(UUID agentID);
-        bool UploadCovered(IClientAPI client);
-        void ApplyGroupCreationCharge(UUID agentID);
-        bool GroupCreationCovered(IClientAPI client);
+        int GetBalance(UUID agentID);
+        bool UploadCovered(IClientAPI client, int amount);
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
+        void ApplyUploadCharge(UUID agentID, int amount, string text);
+
+        int UploadCharge { get; }
+        int GroupCreationCharge { get; }
 
         event ObjectPaid OnObjectPaid;
     }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 7e08ecf688..ae31050853 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
                 if (mm != null)
                 {
-                    if (!mm.UploadCovered(remoteClient))
+                    if (!mm.UploadCovered(remoteClient, mm.UploadCharge))
                     {
                         remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
                         return;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f9da341ba9..33173dda21 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
             IMoneyModule money=RequestModuleInterface<IMoneyModule>();
             if (money != null)
             {
-                money.ApplyUploadCharge(agentID);
+                money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
             }
 
             AddInventoryItem(agentID, item);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 56c0d985f1..3f15b69944 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -722,11 +722,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (money != null)
             {
                 // do the transaction, that is if the agent has got sufficient funds
-                if (!money.GroupCreationCovered(remoteClient)) {
+                if (!money.AmountCovered(remoteClient, money.GroupCreationCharge)) {
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient));
+                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
             }
             UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
 
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index e070077556..6f5ef9e9f8 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -108,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         public event ObjectPaid OnObjectPaid;
 
+        public int UploadCharge
+        {
+            get { return 0; }
+        }
+
+        public int GroupCreationCharge
+        {
+            get { return 0; }
+        }
+
         /// <summary>
         /// Startup
         /// </summary>
@@ -188,17 +198,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         // Please do not refactor these to be just one method
         // Existing implementations need the distinction
         //
-        public void ApplyUploadCharge(UUID agentID)
-        {
-        }
-
-        public void ApplyGroupCreationCharge(UUID agentID)
-        {
-        }
-
         public void ApplyCharge(UUID agentID, int amount, string text)
         {
         }
+        public void ApplyUploadCharge(UUID agentID, int amount, string text)
+        {
+        }
 
         public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
         {
@@ -769,7 +774,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
         }
 
-        public int GetBalance(IClientAPI client)
+        public int GetBalance(UUID agentID)
         {
             return 0;
         }
@@ -777,16 +782,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         // Please do not refactor these to be just one method
         // Existing implementations need the distinction
         //
-        public bool UploadCovered(IClientAPI client)
+        public bool UploadCovered(IClientAPI client, int amount)
         {
-            return AmountCovered(client, PriceUpload);
+            return true;
         }
-
-        public bool GroupCreationCovered(IClientAPI client)
-        {
-            return AmountCovered(client, PriceGroupCreate);
-        }
-
         public bool AmountCovered(IClientAPI client, int amount)
         {
             return true;

From 233c872d24c8cc9d0b883ff8f816f67e57638042 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 2 Jul 2010 09:40:58 +0200
Subject: [PATCH 76/96] Call client.Start() sunchronously. Calling thos async
 avoids some stuttering when people log in, but fatally screws up money.

---
 OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index cda461c4b8..f2bcc0b48f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -900,7 +900,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 // Start the IClientAPI
                 // Spin it off so that it doesn't clog up the LLUDPServer
-                Util.FireAndForget(delegate(object o) { client.Start(); });
+                //Util.FireAndForget(delegate(object o) { client.Start(); });
+
+                // NOTE: DO NOT CALL THIS ASYNCHRONOUSLY!!!!!
+                // This method will ultimately cause the modules to hook
+                // client events in OnNewClient. If they can't do this
+                // before further packets are processed, packets WILL BE LOST.
+                // This includes the all-important EconomyDataRequest!
+                // So using FireAndForget here WILL screw up money. Badly.
+                // You have been warned!
+                client.Start();
             }
             else
             {

From 490f1c144c4e0159b9fb1f130134f8abdab98d81 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Fri, 2 Jul 2010 06:35:38 -0700
Subject: [PATCH 77/96] Fixes mantis #4782

---
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0e849e542c..9d9967a22b 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     imgstream = new MemoryStream();
 
                     // non-async because we know we have the asset immediately.
-                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString());
+                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
 
                     // Decode image to System.Drawing.Image
                     if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))

From 721d8a72987cea267ce9d32dfb91a288019107b2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sat, 3 Jul 2010 07:09:27 +0200
Subject: [PATCH 78/96] Re-add the slashes at the end of the URL. Too much
 depends on them

---
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index f8cb41415c..9b565ed85b 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -142,7 +142,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;
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString();
+                string uri = "/lslhttp/" + urlcode.ToString() + "/";
                
                 m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll,
                         new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,

From 86a82e6ecb564c4b3126d3472482d713213aaf31 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sat, 3 Jul 2010 08:33:08 +0200
Subject: [PATCH 79/96] Now, fix the slash issue the right way. Our URLs now
 work like SL's

---
 .../Region/CoreModules/Scripting/LSLHttp/UrlModule.cs  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9b565ed85b..1fd1f47bf8 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -142,7 +142,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;
@@ -152,10 +152,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 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,HandleHttpPoll,
                         new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,
@@ -386,6 +385,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
             return response;
         }
+
         public void HttpRequestHandler(UUID requestID, Hashtable request)
         {
             lock (request)
@@ -400,8 +400,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
                     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);
+                    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;

From 028303c3e1d1d14b734a4727a98e390f56c42ef5 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sat, 3 Jul 2010 02:39:49 -0700
Subject: [PATCH 80/96] Fixes mantis #4835

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 866e3a3f69..336692225d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -658,7 +658,7 @@ namespace OpenSim.Services.LLLoginService
             Hashtable TempHash;
             foreach (InventoryFolderBase InvFolder in folders)
             {
-                if (InvFolder.ParentID == UUID.Zero)
+                if (InvFolder.ParentID == UUID.Zero && InvFolder.Name == "My Inventory")
                 {
                     rootID = InvFolder.ID;
                 }

From 3d495b709ec897970b24ce48d6a8495d520864d4 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:08:18 -0700
Subject: [PATCH 81/96] Implement a timeout value in the
 SynchronousRestObjectRequester. Default is 100 seconds.

---
 .../SynchronousRestObjectRequester.cs           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index eab463cbd8..bb3b8b1620 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -56,6 +56,21 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <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, 100);
+        }
+        /// <summary>
+        /// Perform a synchronous REST request.
+        /// </summary>
+        /// <param name="verb"></param>
+        /// <param name="requestUrl"></param>
+        /// <param name="obj"> </param>
+        /// <param name="timeout"> </param>
+        /// <returns></returns>
+        ///
+        /// <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, int pTimeout)
         {
             Type type = typeof (TRequest);
             TResponse deserial = default(TResponse);
@@ -81,7 +96,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 int length = (int) buffer.Length;
                 request.ContentLength = length;
-
+                request.Timeout = pTimeout * 1000;
                 Stream requestStream = null;
                 try
                 {

From 2b49cb922799aadcdb93225d74735fcf7da94bbd Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:09:20 -0700
Subject: [PATCH 82/96] Make sure the AssetServiceConnector times out within 30
 seconds. If it doesn't, the client will get bored and give an upload error,
 instead of granting success and entering the asset into our retry queue.

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index e63dd50d64..1f40312d74 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -269,8 +269,8 @@ namespace OpenSim.Services.Connectors
             try
             {
                 newID = SynchronousRestObjectRequester.
-                        MakeRequest<AssetBase, string>("POST", uri, asset);
-                if (newID == null)
+                        MakeRequest<AssetBase, string>("POST", uri, asset, 25);
+                if (newID == null || newID == "")
                 {
                     newID = UUID.Zero.ToString();
                 }

From 39ae1def85fcaf56761c88ad0a000e659941162c Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:10:02 -0700
Subject: [PATCH 83/96] Re-implement the Undo stack as a List; the old
 implementation was buggy

---
 OpenSim/Framework/UndoStack.cs | 51 ++++++++++++----------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 4d800ae425..3799180ceb 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 namespace OpenSim.Framework
 {
@@ -36,33 +37,30 @@ namespace OpenSim.Framework
     [Serializable]
     public class UndoStack<T>
     {
-        private int m_new = 1;
-        private int m_old = 0;
-        private T[] m_Undos;
+        private List<T> m_undolist;
+        private int m_max;
 
         public UndoStack(int capacity)
         {
-            m_Undos = new T[capacity + 1];
+            m_undolist = new List<T>();
+            m_max = capacity;
         }
 
         public bool IsFull
         {
-            get { return m_new == m_old; }
+            get { return m_undolist.Count >= m_max; }
         }
 
         public int Capacity
         {
-            get { return m_Undos.Length - 1; }
+            get { return m_max; }
         }
 
         public int Count
         {
             get
             {
-                int count = m_new - m_old - 1;
-                if (count < 0)
-                    count += m_Undos.Length;
-                return count;
+                return m_undolist.Count;
             }
         }
 
@@ -70,45 +68,32 @@ namespace OpenSim.Framework
         {
             if (IsFull)
             {
-                m_old++;
-                if (m_old >= m_Undos.Length)
-                    m_old -= m_Undos.Length;
+                m_undolist.RemoveAt(0);
             }
-            if (++m_new >= m_Undos.Length)
-                m_new -= m_Undos.Length;
-            m_Undos[m_new] = item;
+            m_undolist.Add(item);
         }
 
         public T Pop()
         {
-            if (Count > 0)
+            if (m_undolist.Count > 0)
             {
-                T deleted = m_Undos[m_new];
-                m_Undos[m_new--] = default(T);
-                if (m_new < 0)
-                    m_new += m_Undos.Length;
-                return deleted;
+                int ind = m_undolist.Count - 1;
+                T item = m_undolist[ind];
+                m_undolist.RemoveAt(ind);
+                return item;
             }
             else
-                throw new InvalidOperationException("Cannot pop from emtpy stack");
+                throw new InvalidOperationException("Cannot pop from empty stack");
         }
 
         public T Peek()
         {
-            return m_Undos[m_new];
+            return m_undolist[m_undolist.Count - 1];
         }
 
         public void Clear()
         {
-            if (Count > 0)
-            {
-                for (int i = 0; i < m_Undos.Length; i++)
-                {
-                    m_Undos[i] = default(T);
-                }
-                m_new = 1;
-                m_old = 0;
-            }
+            m_undolist.Clear();
         }
     }
 }

From fe2b044d38f3bd3aa669334d34567fd991a67b3e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:10:55 -0700
Subject: [PATCH 84/96] Fix Undo!  Made a lot of changes to Undo state saving;
 it now considers that groups of objects can be moved and not just individual
 prims..

---
 .../Framework/Scenes/SceneObjectGroup.cs      | 39 +++++++++----
 .../Framework/Scenes/SceneObjectPart.cs       | 16 +++++-
 OpenSim/Region/Framework/Scenes/UndoState.cs  | 55 +++++++++++++++----
 3 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c48ce3baa5..da664dac40 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -349,7 +349,21 @@ namespace OpenSim.Region.Framework.Scenes
         public virtual Quaternion Rotation
         {
             get { return m_rotation; }
-            set { m_rotation = value; }
+            set {
+                lockPartsForRead(true);
+                try
+                {
+                    foreach(SceneObjectPart p in m_parts.Values)
+                    {
+                        p.StoreUndoState(true);
+                    }
+                }
+                finally
+                {
+                    lockPartsForRead(false);
+                }
+                m_rotation = value; 
+            }
         }
 
         public Quaternion GroupRotation
@@ -421,6 +435,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_rootPart.GroupPosition; }
             set
             {
+                
                 Vector3 val = value;
 
                 if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
@@ -431,7 +446,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 lockPartsForRead(true);
-
+                foreach (SceneObjectPart part in m_parts.Values)
+                {
+                    part.IgnoreUndoUpdate = true;
+                }
                 if (RootPart.GetStatusSandbox())
                 {
                     if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -443,12 +461,12 @@ namespace OpenSim.Region.Framework.Scenes
                         return;
                     }
                 }
-
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
+                    part.IgnoreUndoUpdate = false;
+                    part.StoreUndoState(true);
                     part.GroupPosition = val;
                 }
-
                 lockPartsForRead(false);
 
                 //if (m_rootPart.PhysActor != null)
@@ -724,7 +742,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
-                    
                     Vector3 partscale = part.Scale;
                     Vector3 partoffset = part.OffsetPosition;
 
@@ -3132,7 +3149,6 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
             {
-                part.IgnoreUndoUpdate = true;
                 if (scale.X > m_scene.m_maxNonphys)
                     scale.X = m_scene.m_maxNonphys;
                 if (scale.Y > m_scene.m_maxNonphys)
@@ -3218,8 +3234,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     y *= a;
                                     z *= a;
                                 }
-                                obPart.IgnoreUndoUpdate = false;
-                                obPart.StoreUndoState();
+                                
                             }
                         }
                     }
@@ -3229,13 +3244,17 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 prevScale = part.Scale;
                 prevScale.X *= x;
                 prevScale.Y *= y;
-                prevScale.Z *= z;
+                prevScale.Z *= z;;
+                part.IgnoreUndoUpdate = true;
                 part.Resize(prevScale);
+                part.IgnoreUndoUpdate = false;
 
                 lockPartsForRead(true);
                 {
                     foreach (SceneObjectPart obPart in m_parts.Values)
                     {
+                        obPart.IgnoreUndoUpdate = false;
+                        obPart.StoreUndoState(true);
                         obPart.IgnoreUndoUpdate = true;
                         if (obPart.UUID != m_rootPart.UUID)
                         {
@@ -3251,7 +3270,6 @@ namespace OpenSim.Region.Framework.Scenes
                             obPart.UpdateOffSet(currentpos);
                         }
                         obPart.IgnoreUndoUpdate = false;
-                        obPart.StoreUndoState();
                     }
                 }
                 lockPartsForRead(false);
@@ -3263,7 +3281,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 part.IgnoreUndoUpdate = false;
-                part.StoreUndoState();
                 HasGroupChanged = true;
                 ScheduleGroupForTerseUpdate();
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5b007e603f..72ad281944 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3504,8 +3504,11 @@ namespace OpenSim.Region.Framework.Scenes
             m_parentGroup.ScheduleGroupForTerseUpdate();
             //m_parentGroup.ScheduleGroupForFullUpdate();
         }
-
         public void StoreUndoState()
+        {
+            StoreUndoState(false);
+        }
+        public void StoreUndoState(bool group)
         {
             if (!Undoing)
             {
@@ -3528,7 +3531,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_parentGroup.GetSceneMaxUndo() > 0)
                             {
                                 UndoState nUndo = new UndoState(this);
-
+                                nUndo.GroupChange = group;
                                 m_undo.Push(nUndo);
                             }
 
@@ -4010,6 +4013,15 @@ namespace OpenSim.Region.Framework.Scenes
                         nUndo = new UndoState(this);
                     }
                     UndoState goback = m_undo.Pop();
+                    m_log.Debug("Got goback");
+                    if (goback == null)
+                    {
+                        m_log.Debug("it's null");
+                    }
+                    else
+                    {
+                        m_log.Debug(goback.GroupPosition.ToString());
+                    }
                     if (goback != null)
                     {
                         goback.PlaybackState(this);
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 55e407ec5f..77381ab7d9 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -35,6 +35,10 @@ namespace OpenSim.Region.Framework.Scenes
         public Vector3 Position = Vector3.Zero;
         public Vector3 Scale = Vector3.Zero;
         public Quaternion Rotation = Quaternion.Identity;
+        public bool GroupChange = false;
+        public Vector3 GroupPosition = Vector3.Zero;
+        public Quaternion GroupRotation = Quaternion.Identity;
+        public Vector3 GroupScale = Vector3.Zero;
 
         public UndoState(SceneObjectPart part)
         {
@@ -42,12 +46,24 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (part.ParentID == 0)
                 {
-                    Position = part.ParentGroup.AbsolutePosition;
+                    GroupScale = part.Shape.Scale;
+
+                    //FUBAR WARNING: Do NOT get the group's absoluteposition here 
+                    //or you'll experience a loop and/or a stack issue
+                    GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
+                    GroupRotation = part.ParentGroup.Rotation;
+                    Position = part.ParentGroup.RootPart.AbsolutePosition;
                     Rotation = part.RotationOffset;
                     Scale = part.Shape.Scale;
                 }
                 else
                 {
+                    GroupScale = part.Shape.Scale;
+
+                    //FUBAR WARNING: Do NOT get the group's absoluteposition here 
+                    //or you'll experience a loop and/or a stack issue
+                    GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
+                    GroupRotation = part.ParentGroup.Rotation;
                     Position = part.OffsetPosition;
                     Rotation = part.RotationOffset;
                     Scale = part.Shape.Scale;
@@ -61,14 +77,14 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (part.ParentID == 0)
                 {
-                    if (Position == part.ParentGroup.AbsolutePosition && Rotation == part.ParentGroup.Rotation)
+                    if (Position == part.ParentGroup.RootPart.AbsolutePosition && Rotation == part.ParentGroup.Rotation && GroupPosition == part.ParentGroup.RootPart.AbsolutePosition && part.ParentGroup.Rotation == GroupRotation && part.Shape.Scale == GroupScale)
                         return true;
                     else
                         return false;
                 }
                 else
                 {
-                    if (Position == part.OffsetPosition && Rotation == part.RotationOffset && Scale == part.Shape.Scale)
+                    if (Position == part.OffsetPosition && Rotation == part.RotationOffset && Scale == part.Shape.Scale && GroupPosition == part.ParentGroup.RootPart.AbsolutePosition && part.ParentGroup.Rotation == GroupRotation && part.Shape.Scale == GroupScale)
                         return true;
                     else
                         return false;
@@ -84,10 +100,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 part.Undoing = true;
 
-                if (part.ParentID == 0)
+                if (part.ParentID == 0 && GroupChange == false)
                 {
                     if (Position != Vector3.Zero)
-                        part.ParentGroup.AbsolutePosition = Position;
+                    part.ParentGroup.AbsolutePosition = Position;
                     part.RotationOffset = Rotation;
                     if (Scale != Vector3.Zero)
                         part.Resize(Scale);
@@ -95,11 +111,30 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (Position != Vector3.Zero)
-                        part.OffsetPosition = Position;
-                    part.UpdateRotation(Rotation);
-                    if (Scale != Vector3.Zero)
-                        part.Resize(Scale); part.ScheduleTerseUpdate();
+                    if (GroupChange)
+                    {
+                        if (Position != Vector3.Zero)
+                        {
+                            //Calculate the scale...
+                            Vector3 gs = part.Shape.Scale;
+                            float scale = GroupScale.Z / gs.Z;
+
+                            //Scale first since it can affect our position
+                            part.ParentGroup.GroupResize(gs * scale, part.LocalId);
+                            part.ParentGroup.AbsolutePosition = GroupPosition;
+                            part.ParentGroup.Rotation = GroupRotation;
+                           
+                        }
+                    }
+                    else
+                    {
+                        if (Position != Vector3.Zero) //We can use this for all the updates since all are set
+                        {
+                            part.OffsetPosition = Position;
+                            part.UpdateRotation(Rotation);
+                            part.Resize(Scale); part.ScheduleTerseUpdate();
+                        }
+                    }
                 }
                 part.Undoing = false;
 

From 4cd5e642319b31e1da838ca6fda97ae2992b2c79 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 09:22:58 -0700
Subject: [PATCH 85/96] Use SendTransferAbort in a more sensible place

---
 .../Region/ClientStack/LindenUDP/LLClientView.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 14b716b746..4dfd5d1d14 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11511,12 +11511,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
 
-            if (!m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived))
-            {
-                //We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
-                //which causes it to not request any more for a while. Which is bad.
-                SendTransferAbort(transferRequest);
-            }
+
+            //Note, the bool returned from the below function is useless since it is always false.
+            m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
+
         }
 
         /// <summary>
@@ -11565,8 +11563,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
 
                 //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing.  Dropping", requestID);
-
-                // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
+                
+                //We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
+                //which causes it to not request any more for a while. Which is bad.
+                SendTransferAbort(transferRequest);
                 return;
             }
 

From c117f2144c94e6e04d488567d3632fdf75af4e14 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sat, 3 Jul 2010 10:40:33 -0700
Subject: [PATCH 86/96] Compiled Robust.32BitLaunch.exe to .Net 3.5

---
 bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 747d02ff03628e0b5fffabf343a67333bc577b25..4d2698b9fb2bdc85cd32ef3a2bfd798cc221735d 100644
GIT binary patch
delta 884
zcmZ9KT}YEr7{~wTdEKk-i>aITDUL<1wbnM#K_W<vG8L4Ti5HP#V3MWHkDJJ??4pp$
zbqJKSk|fY>lHElYN)QMIT?Bm)1_seZVO>~(L_P1(9CTiu-+9iT|9Rf$98S`o^p9N8
zM*H`shPTrlUux!<J?aCR!J``ZW=gpWtgV2R*HgQIZPHDC*&<45$}BI5!IC7qjZwov
zFu~~tMsfg+*8<RG$QG21WKTE%GvX}uc=J>m%A{?Xv^|sRV#Av;l=!)XH{YlL@)q#C
z6N^<`xpl*>cRN{L|I5FfPPUA0SmJB4{7ywVh1_T{d0o<>xf;WPV4yr02}g`Gnb5@y
z65tsG#(6f5<%#vhJI{9X8jf)j@P-@mG{w-D4e%l1In;DG%JXGjTV=mi>f%4}-K+(h
z;o`8#S<Rgoz)9%1rZ}Uxptz*Cs#qutPe`#-)CwIJ6o-{ErT9wBi%NXv;yQ}xCwn4H
zGZNH8I>zWA>rdz*+3|s1vhsr!9<n*BJFyup{5jF4*r|AqS&WO!9k|MLAcY$g#uz54
z0+V=3m6*m+ej>T}%C&NpCjbi?5I_Msm|GP+IK%mFrI%rt^Gc=HDaLR=%u+jEFi+zh
zvlkzk=kW!#$VzgP+`5M62aF78;(H`HWO8phW!&h0V}UjK*c4Bn&~H(CCFiwp)LVk3
zv$2($=|B0mCkBo$$@gZDsJdzKi5A&wncu@tzuu@~R2$-$<3~Pc0gl9?v4OYMs|^q4
zqj#VE+P^ySXjzkO)^2;(`inPqUH8dF>lRA-Qf_COY*rzwZOOFV{z=OXA%ZfLqayt~
Q&q8!>UpmjZEK<SjzpZtk`v3p{

delta 990
zcmZ9LUr5tY6vw~!{@hR9#+dGplqp-2T-zAajUdEQGEG}1Y)TS=D~B!rOn;k&MJoDY
zNYJ_u8buMkln81g=ppRSQx81^{qrU1sUCW;Afg9@&hMvg(EV{g_uO;NJ@=e@e|OS1
z>ANu_^(<CrW-EB5H?z=Xdg}p>gIWXdLzi({j6Hyn<^eM75l-$C-K?5d8N?JDcfd;)
zYR9N^=wNk{Q!yaXoB^^}F$P2jH%*iPdMKnCc9&{mO<s)U#dCR4W;x%ygTqH5+!i$g
zxZ6tOKCIVM<er?joV1a8dzYP+R&troxhPv|@spPol~JOV+-(<T$<`6_2mHZ6u;!pz
zlMVyK1`fE!fkhfaRF*4}RuV&fDb?eP4p^gvT%8d-Ed<P@bG3A~HqrQ+=20;!RoiF>
zI-9Ld&ahKAi51B?F^*oyc!W9P3yq&OZfdkKRqxl>s<Bt&9d?z;Sk}0zX+CKz<iFTq
zl+#u++PH_yxIon7F@Hev8{SO%4ZhAzD3v5h#(pM=a6x*)if;OLAx5+!p>agx7_k!9
zh*iiC&A5eEycYNIo*$sRfAc!5Ac_VQ!yz>jRUbbLI7zfn6@HXsiRjYk#S@Z)n!XP2
zNIrt4Lo`G*^J#o1xgR#>M+$q1SKuX1BgEQJFiGb|B}iC~s1h(kr51=0ozs3>J>UP@
zCKn4j#WOmTP7KEVU2!FqNDk4>AsSQq;^}53HW<H@RQem!bfITQ)A6iDzRR=AMQhA#
zJpb`tEI51O`pt)P6;sboiFv(?HHv3?PwSZ$hTZ=5qtRRd-*)W!i}d?2L`~M5sVR{f
z9*B*#(^h76jU#7qgv2-fOFKQiu$s4;|1|Y5J+iP-tQzc$i4TTk=^s+;G?V(+92sXB
k^JXs_tt@LYeU*x9QG*a_5z788F>vmv%a&L-SSC>T4>UQw1poj5


From edcfaf60c99b7cde324621c2ffcfbb16e4eb4c5e Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sat, 3 Jul 2010 20:27:00 +0200
Subject: [PATCH 87/96] Fix IMs the right way. This sets it up so that
 timestamps are actually in PST (to match viewer time), does correct storage
 and retrieval of IMs, corrects the session ID and makes sure IMs don't get
 marked "saved" if they're live. Removes the group IM save option, which our
 group IM module never had in the first place, as saving group chatter makes
 no sense at all.

---
 .../InstantMessage/InstantMessageModule.cs    | 27 ++++++--
 .../InstantMessage/OfflineMessageModule.cs    | 63 +++++++++++--------
 .../Region/Framework/Scenes/ScenePresence.cs  |  7 ++-
 .../Shared/Api/Implementation/LSL_Api.cs      | 22 ++++++-
 4 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index a7aa4ea0fb..ffdac58ac9 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,15 +156,30 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
-            // Force timestamp to server time to avoid "Saved on" headers
-            // being generated for online users
-            im.timestamp = (uint)Util.UnixTimeSinceEpoch();
+            DateTime dt = DateTime.UtcNow;
 
-            if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
-                dialog == (byte)InstantMessageDialog.MessageFromObject)
+            // Ticks from UtcNow, but make it look like local. Evil, huh?
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
+
+            try
             {
-                im.offline = 1;
+                // 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);
+
+            im.timestamp = (uint)Util.ToUnixTime(dt);
+
+            // If client is null, this message comes from storage and IS offline
+            if (client != null)
+                im.offline = 0;
 
             if (m_TransferModule != null)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index a2dc91f3b8..feeb9e6955 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -192,6 +192,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     // Needed for proper state management for stored group
                     // invitations
                     //
+
+                    im.offline = 1;
+
+                    // Reconstruct imSessionID
+                    if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                    {
+                        UUID fromAgentID = new UUID(im.fromAgentID);
+                        UUID sessionID = fromAgentID ^ client.AgentId;
+                        im.imSessionID = new Guid(sessionID.ToString());
+                    }
+
                     Scene s = FindScene(client.AgentId);
                     if (s != null)
                         s.EventManager.TriggerIncomingInstantMessage(im);
@@ -201,35 +212,37 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void UndeliveredMessage(GridInstantMessage im)
         {
-            if (im.dialog == 19)
-                im.offline = 1; // We want them pushed out to the server
-            if ((im.offline != 0)
-                && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
+            if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
+                im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
+                im.dialog != (byte)InstantMessageDialog.GroupNotice &&
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
             {
-                // It's not delivered. Make sure the scope id is saved
-                // We don't need the imSessionID here anymore, overwrite it
-                Scene scene = FindScene(new UUID(im.fromAgentID));
-                if (scene == null)
-                    scene = m_SceneList[0];
-                im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString());
+                return;
+            }
 
-                bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
-                        "POST", m_RestURL+"/SaveMessage/", im);
+            // It's not delivered. Make sure the scope id is saved
+            // We don't need the imSessionID here anymore, overwrite it
+            Scene scene = FindScene(new UUID(im.fromAgentID));
+            if (scene == null)
+                scene = m_SceneList[0];
+            im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString());
 
-                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
-                {
-                    IClientAPI client = FindClient(new UUID(im.fromAgentID));
-                    if (client == null)
-                        return;
+            bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
+                    "POST", m_RestURL+"/SaveMessage/", im);
 
-                    client.SendInstantMessage(new GridInstantMessage(
-                            null, new UUID(im.toAgentID),
-                            "System", new UUID(im.fromAgentID),
-                            (byte)InstantMessageDialog.MessageFromAgent,
-                            "User is not logged in. "+
-                            (success ? "Message saved." : "Message not saved"),
-                            false, new Vector3()));
-                }
+            if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+            {
+                IClientAPI client = FindClient(new UUID(im.fromAgentID));
+                if (client == null)
+                    return;
+
+                client.SendInstantMessage(new GridInstantMessage(
+                        null, new UUID(im.toAgentID),
+                        "System", new UUID(im.fromAgentID),
+                        (byte)InstantMessageDialog.MessageFromAgent,
+                        "User is not logged in. "+
+                        (success ? "Message saved." : "Message not saved"),
+                        false, new Vector3()));
             }
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4a4cac9f85..e51d9ee605 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3730,8 +3730,11 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
                 {
                     CollidingMessage.Colliders = colliding;
 
-                    foreach (SceneObjectGroup att in Attachments)
-                        Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                    lock (m_attachments)
+                    {
+                        foreach (SceneObjectGroup att in m_attachments)
+                            Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 11d7c2bdf0..f15350499c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3252,7 +3252,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
 //            m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
 //            m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
-            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
+            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
+            {
+                // No logging here, as it could be VERY spammy
+            }
+
+            // And make it look local again to fool the unix time util
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+
+            msg.timestamp = (uint)Util.ToUnixTime(dt);
+
             //if (client != null)
             //{
                 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;

From abe0a9ff495fb6ebb36fd88a1f85c1ba24a42e6c Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 4 Jul 2010 02:59:38 -0700
Subject: [PATCH 88/96] Fixes the obvious problem in mantis #4841. Melanie
 needs to look at other potential problems there, though.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 33173dda21..bcb5f7c492 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1608,7 +1608,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (action == DeRezAction.SaveToExistingUserInventoryItem)
                 permissionToDelete = false;
 
-            // if we want to take a copy,, we also don't want to delete
+            // if we want to take a copy, we also don't want to delete
             // Note: after this point, the permissionToTakeCopy flag
             // becomes irrelevant. It already includes the permissionToTake
             // permission and after excluding no copy items here, we can
@@ -1619,6 +1619,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (!permissionToTakeCopy)
                     return;
 
+                permissionToTake = true;
                 // Don't delete
                 permissionToDelete = false;
             }

From 3368e3853ae931e8e7137dc10a410265b4afbd5a Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 06:45:04 -0700
Subject: [PATCH 89/96] Check cached asset to make sure it contains data, and
 if not, re-request

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 1f40312d74..ad18a2343e 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -151,8 +151,8 @@ namespace OpenSim.Services.Connectors
             AssetBase asset = null;
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
-
-            if (asset == null)
+            
+            if (asset == null || asset.Data == null || asset.Data.Length == 0)
             {
                 asset = SynchronousRestObjectRequester.
                         MakeRequest<int, AssetBase>("GET", uri, 0);
@@ -229,7 +229,7 @@ namespace OpenSim.Services.Connectors
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
 
-            if (asset == null)
+            if (asset == null || asset.Data == null || asset.Data.Length == 0)
             {
                 bool result = false;
 

From f3e902092af7924f5104ffef15937820df532108 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 12:51:48 -0700
Subject: [PATCH 90/96] Add System.Core assembly reference to two projects so
 that TimeZoneInfo can be used

---
 prebuild.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prebuild.xml b/prebuild.xml
index 4158ed1359..9b8154241b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1407,6 +1407,7 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Core"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
@@ -2405,6 +2406,7 @@
 
       <ReferencePath>../../../../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Core"/>
       <Reference name="System.Data"/>
       <Reference name="System.Web"/>
       <Reference name="System.Xml"/>

From 7665013ad8c7ac876955dc803619405dfa2af71d Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 19:25:54 -0700
Subject: [PATCH 91/96] Correct positioning of timeout modifier in the
 SynchronousRestObjectRequester

---
 .../Servers/HttpServer/SynchronousRestObjectRequester.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index bb3b8b1620..f07f7ab75c 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            request.Timeout = pTimeout * 1000;
 
             if ((verb == "POST") || (verb == "PUT"))
             {
@@ -96,7 +97,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 int length = (int) buffer.Length;
                 request.ContentLength = length;
-                request.Timeout = pTimeout * 1000;
                 Stream requestStream = null;
                 try
                 {

From 5b68343361cbd000a2f024b37797ec235abb7207 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 19:28:39 -0700
Subject: [PATCH 92/96] The majority of the Undo fix.  There is still an issue
 with Rotation which i'll address next; however position undo and scale undo
 should be working just fine now. Also removed some residual debug logging.

---
 OpenSim/Framework/UndoStack.cs                |  9 ++-
 .../Framework/Scenes/SceneObjectGroup.cs      | 38 ++++-----
 .../Framework/Scenes/SceneObjectPart.cs       | 61 +++++++-------
 .../Serialization/SceneObjectSerializer.cs    |  4 +-
 OpenSim/Region/Framework/Scenes/UndoState.cs  | 80 ++++++++++++++++++-
 5 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 3799180ceb..4cd779aed3 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -88,7 +88,14 @@ namespace OpenSim.Framework
 
         public T Peek()
         {
-            return m_undolist[m_undolist.Count - 1];
+            if (m_undolist.Count > 0)
+            {
+                return m_undolist[m_undolist.Count - 1];
+            }
+            else
+            {
+                return default(T);
+            }
         }
 
         public void Clear()
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index da664dac40..34712b82ab 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -355,7 +355,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach(SceneObjectPart p in m_parts.Values)
                     {
-                        p.StoreUndoState(true);
+                        p.StoreUndoState(UndoType.STATE_GROUP_ROTATION);
                     }
                 }
                 finally
@@ -435,7 +435,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_rootPart.GroupPosition; }
             set
             {
-                
                 Vector3 val = value;
 
                 if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
@@ -464,7 +463,7 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
                     part.IgnoreUndoUpdate = false;
-                    part.StoreUndoState(true);
+                    part.StoreUndoState(UndoType.STATE_GROUP_POSITION);
                     part.GroupPosition = val;
                 }
                 lockPartsForRead(false);
@@ -1488,7 +1487,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)
         {
-            part.StoreUndoState();
+            part.StoreUndoState(UndoType.STATE_PRIM_ALL);
             part.OnGrab(offsetPos, remoteClient);
         }
 
@@ -3245,6 +3244,9 @@ namespace OpenSim.Region.Framework.Scenes
                 prevScale.X *= x;
                 prevScale.Y *= y;
                 prevScale.Z *= z;;
+
+                part.IgnoreUndoUpdate = false;
+                part.StoreUndoState(UndoType.STATE_GROUP_SCALE);
                 part.IgnoreUndoUpdate = true;
                 part.Resize(prevScale);
                 part.IgnoreUndoUpdate = false;
@@ -3253,11 +3255,12 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (SceneObjectPart obPart in m_parts.Values)
                     {
-                        obPart.IgnoreUndoUpdate = false;
-                        obPart.StoreUndoState(true);
-                        obPart.IgnoreUndoUpdate = true;
                         if (obPart.UUID != m_rootPart.UUID)
                         {
+                            obPart.IgnoreUndoUpdate = false;
+                            obPart.StoreUndoState(UndoType.STATE_GROUP_SCALE);
+                            obPart.IgnoreUndoUpdate = true;
+
                             Vector3 currentpos = new Vector3(obPart.OffsetPosition);
                             currentpos.X *= x;
                             currentpos.Y *= y;
@@ -3296,14 +3299,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void UpdateGroupPosition(Vector3 pos)
         {
-            foreach (SceneObjectPart part in Children.Values)
-            {
-                part.StoreUndoState();
-            }
             if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
             {
                 if (IsAttachment)
                 {
+                    m_rootPart.StoreUndoState(UndoType.STATE_GROUP_POSITION);
                     m_rootPart.AttachedPos = pos;
                 }
                 if (RootPart.GetStatusSandbox())
@@ -3336,7 +3336,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetChildPart(localID);
             foreach (SceneObjectPart parts in Children.Values)
             {
-                parts.StoreUndoState();
+                parts.StoreUndoState(UndoType.STATE_PRIM_POSITION);
             }
             if (part != null)
             {
@@ -3361,7 +3361,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             foreach (SceneObjectPart part in Children.Values)
             {
-                part.StoreUndoState();
+                part.StoreUndoState(UndoType.STATE_PRIM_POSITION);
             }
             Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
             Vector3 oldPos =
@@ -3409,7 +3409,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             foreach (SceneObjectPart parts in Children.Values)
             {
-                parts.StoreUndoState();
+                parts.StoreUndoState(UndoType.STATE_GROUP_ROTATION);
             }
             m_rootPart.UpdateRotation(rot);
 
@@ -3433,7 +3433,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             foreach (SceneObjectPart parts in Children.Values)
             {
-                parts.StoreUndoState();
+                parts.StoreUndoState(UndoType.STATE_GROUP_ROTATION);
             }
             m_rootPart.UpdateRotation(rot);
 
@@ -3460,7 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetChildPart(localID);
             foreach (SceneObjectPart parts in Children.Values)
             {
-                parts.StoreUndoState();
+                parts.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
             }
             if (part != null)
             {
@@ -3496,7 +3496,7 @@ namespace OpenSim.Region.Framework.Scenes
                     part.UpdateRotation(rot);
                     part.OffsetPosition = pos;
                     part.IgnoreUndoUpdate = false;
-                    part.StoreUndoState();
+                    part.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                 }
             }
         }
@@ -3510,7 +3510,7 @@ namespace OpenSim.Region.Framework.Scenes
             Quaternion axRot = rot;
             Quaternion oldParentRot = m_rootPart.RotationOffset;
 
-            m_rootPart.StoreUndoState();
+            m_rootPart.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
             m_rootPart.UpdateRotation(rot);
             if (m_rootPart.PhysActor != null)
             {
@@ -3542,7 +3542,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (childpart != m_rootPart)
                 {
                     childpart.IgnoreUndoUpdate = false;
-                    childpart.StoreUndoState();
+                    childpart.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                 }
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 72ad281944..93a23cad0d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_offsetPosition; }
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_POSITION);
                 m_offsetPosition = value;
 
                 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                 m_rotationOffset = value;
 
                 PhysicsActor actor = PhysActor;
@@ -958,7 +958,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_shape.Scale; }
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_SCALE);
                 if (m_shape != null)
                 {
                     m_shape.Scale = value;
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_redo.Clear();
             }
-            StoreUndoState();
+            StoreUndoState(UndoType.STATE_ALL);
         }
 
         public byte ConvertScriptUintToByte(uint indata)
@@ -2721,7 +2721,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="scale"></param>
         public void Resize(Vector3 scale)
         {
-            StoreUndoState();
+            StoreUndoState(UndoType.STATE_PRIM_SCALE);
             m_shape.Scale = scale;
 
             ParentGroup.HasGroupChanged = true;
@@ -3504,13 +3504,11 @@ namespace OpenSim.Region.Framework.Scenes
             m_parentGroup.ScheduleGroupForTerseUpdate();
             //m_parentGroup.ScheduleGroupForFullUpdate();
         }
-        public void StoreUndoState()
+        public void StoreUndoState(UndoType type)
         {
-            StoreUndoState(false);
-        }
-        public void StoreUndoState(bool group)
-        {
-            if (!Undoing)
+
+
+            if (!Undoing && (m_parentGroup == null || m_parentGroup.RootPart == null || !m_parentGroup.RootPart.Undoing))
             {
                 if (!IgnoreUndoUpdate)
                 {
@@ -3521,17 +3519,25 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_undo.Count > 0)
                             {
                                 UndoState last = m_undo.Peek();
-                                if (last != null)
-                                {
-                                    if (last.Compare(this))
-                                        return;
-                                }
+                                
                             }
 
                             if (m_parentGroup.GetSceneMaxUndo() > 0)
                             {
-                                UndoState nUndo = new UndoState(this);
-                                nUndo.GroupChange = group;
+                                UndoState lastUndo = m_undo.Peek();
+
+                                UndoState nUndo = new UndoState(this, type);
+
+                                if (lastUndo != null)
+                                {
+                                    TimeSpan ts = DateTime.Now.Subtract(lastUndo.LastUpdated);
+                                    if (ts.TotalMilliseconds < 500)
+                                    {
+                                        //Delete the last entry since it was less than 500 milliseconds ago
+                                        nUndo.Merge(lastUndo);
+                                        m_undo.Pop();
+                                    }
+                                }
                                 m_undo.Push(nUndo);
                             }
 
@@ -4008,20 +4014,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_undo.Count > 0)
                 {
                     UndoState nUndo = null;
+                    UndoState goback = m_undo.Pop();
                     if (m_parentGroup.GetSceneMaxUndo() > 0)
                     {
-                        nUndo = new UndoState(this);
-                    }
-                    UndoState goback = m_undo.Pop();
-                    m_log.Debug("Got goback");
-                    if (goback == null)
-                    {
-                        m_log.Debug("it's null");
-                    }
-                    else
-                    {
-                        m_log.Debug(goback.GroupPosition.ToString());
+                        nUndo = new UndoState(this, goback.Type);
                     }
+
+                    
                     if (goback != null)
                     {
                         goback.PlaybackState(this);
@@ -4036,13 +4035,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             lock (m_redo)
             {
+                UndoState gofwd = m_redo.Pop();
                 if (m_parentGroup.GetSceneMaxUndo() > 0)
                 {
-                    UndoState nUndo = new UndoState(this);
+                    UndoState nUndo = new UndoState(this, gofwd.Type);
 
                     m_undo.Push(nUndo);
                 }
-                UndoState gofwd = m_redo.Pop();
                 if (gofwd != null)
                     gofwd.PlayfwdState(this);
             }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 5bdaa17f69..77e477fa2d 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     sceneObject.AddPart(part);
                     part.LinkNum = linkNum;
                     part.TrimPermissions();
-                    part.StoreUndoState();
+                    part.StoreUndoState(UndoType.STATE_ALL);
                     reader.Close();
                     sr.Close();
                 }
@@ -231,7 +231,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     if (originalLinkNum != 0)
                         part.LinkNum = originalLinkNum;
 
-                    part.StoreUndoState();
+                    part.StoreUndoState(UndoType.STATE_ALL);
                     reader.Close();
                     sr.Close();
                 }
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 77381ab7d9..ad05351e7e 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,26 +27,43 @@
 
 using OpenMetaverse;
 using OpenSim.Region.Framework.Interfaces;
+using System;
 
 namespace OpenSim.Region.Framework.Scenes
 {
+    [Flags]
+    public enum UndoType
+    {
+        STATE_PRIM_POSITION = 1,
+        STATE_PRIM_ROTATION = 2,
+        STATE_PRIM_SCALE = 4,
+        STATE_PRIM_ALL = 7,
+        STATE_GROUP_POSITION = 8,
+        STATE_GROUP_ROTATION = 16,
+        STATE_GROUP_SCALE = 32,
+        STATE_GROUP_ALL = 56,
+        STATE_ALL = 63       
+    }
+
     public class UndoState
     {
         public Vector3 Position = Vector3.Zero;
         public Vector3 Scale = Vector3.Zero;
         public Quaternion Rotation = Quaternion.Identity;
-        public bool GroupChange = false;
         public Vector3 GroupPosition = Vector3.Zero;
         public Quaternion GroupRotation = Quaternion.Identity;
         public Vector3 GroupScale = Vector3.Zero;
+        public DateTime LastUpdated = DateTime.Now;
+        public UndoType Type;
 
-        public UndoState(SceneObjectPart part)
+        public UndoState(SceneObjectPart part, UndoType type)
         {
+            Type = type;
             if (part != null)
             {
                 if (part.ParentID == 0)
                 {
-                    GroupScale = part.Shape.Scale;
+                    GroupScale = part.ParentGroup.RootPart.Shape.Scale;
 
                     //FUBAR WARNING: Do NOT get the group's absoluteposition here 
                     //or you'll experience a loop and/or a stack issue
@@ -55,6 +72,7 @@ namespace OpenSim.Region.Framework.Scenes
                     Position = part.ParentGroup.RootPart.AbsolutePosition;
                     Rotation = part.RotationOffset;
                     Scale = part.Shape.Scale;
+                    LastUpdated = DateTime.Now;
                 }
                 else
                 {
@@ -67,10 +85,54 @@ namespace OpenSim.Region.Framework.Scenes
                     Position = part.OffsetPosition;
                     Rotation = part.RotationOffset;
                     Scale = part.Shape.Scale;
+                    LastUpdated = DateTime.Now;
                 }
             }
         }
-
+        public void Merge(UndoState last)
+        {
+            if ((Type & UndoType.STATE_GROUP_POSITION) == 0 || ((last.Type & UndoType.STATE_GROUP_POSITION) >= (Type & UndoType.STATE_GROUP_POSITION)))
+            {
+                GroupPosition = last.GroupPosition;
+                Position = last.Position;
+            }
+            if ((Type & UndoType.STATE_GROUP_SCALE) == 0 || ((last.Type & UndoType.STATE_GROUP_SCALE) >= (Type & UndoType.STATE_GROUP_SCALE)))
+            {
+                Console.WriteLine("Setting groupscale to " + last.GroupScale.ToString());
+                GroupScale = last.GroupScale;
+                Scale = last.Scale;
+            }
+            if ((Type & UndoType.STATE_GROUP_ROTATION) == 0 || ((last.Type & UndoType.STATE_GROUP_ROTATION) >= (Type & UndoType.STATE_GROUP_ROTATION)))
+            {
+                GroupRotation = last.GroupRotation;
+                Rotation = last.Rotation;
+            }
+            if ((Type & UndoType.STATE_PRIM_POSITION) == 0 || ((last.Type & UndoType.STATE_PRIM_POSITION) >= (Type & UndoType.STATE_PRIM_POSITION)))
+            {
+                Position = last.Position;
+            }
+            if ((Type & UndoType.STATE_PRIM_SCALE) == 0 || ((last.Type & UndoType.STATE_PRIM_SCALE) >= (Type & UndoType.STATE_PRIM_SCALE)))
+            {
+                Scale = last.Scale;
+            }
+            if ((Type & UndoType.STATE_PRIM_ROTATION) == 0 || ((last.Type & UndoType.STATE_PRIM_ROTATION) >= (Type & UndoType.STATE_PRIM_ROTATION)))
+            {
+                Rotation = last.Rotation;
+            }
+            Type = Type | last.Type;
+        }
+        public bool Compare(UndoState undo)
+        {
+            if (undo == null || Position == null) return false;
+            if (undo.Position == Position && undo.Rotation == Rotation  && undo.Scale == Scale && undo.GroupPosition == GroupPosition && undo.GroupScale == GroupScale && undo.GroupRotation == GroupRotation)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
         public bool Compare(SceneObjectPart part)
         {
             if (part != null)
@@ -96,6 +158,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void PlaybackState(SceneObjectPart part)
         {
+            bool GroupChange = false;
+            if ((Type & UndoType.STATE_GROUP_POSITION) != 0
+                || (Type & UndoType.STATE_GROUP_ROTATION) != 0
+                || (Type & UndoType.STATE_GROUP_SCALE) != 0)
+            {
+                GroupChange = true;
+            }
+
             if (part != null)
             {
                 part.Undoing = true;
@@ -113,6 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (GroupChange)
                     {
+                        part.ParentGroup.RootPart.Undoing = true;
                         if (Position != Vector3.Zero)
                         {
                             //Calculate the scale...
@@ -125,6 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
                             part.ParentGroup.Rotation = GroupRotation;
                            
                         }
+                        part.ParentGroup.RootPart.Undoing = false;
                     }
                     else
                     {

From c616335019dc9419460407930af4e40e84663efa Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 19:58:52 -0700
Subject: [PATCH 93/96] Rotation undo fix and remove a debug chatter i missed.
 Still not working: Individual child prim rotational undo and special cases
 where the root prim was moved or rotated (all the children then need to
 restore their offsets). Coming shortly.

---
 OpenSim/Region/Framework/Scenes/UndoState.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index ad05351e7e..f9601e6034 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //FUBAR WARNING: Do NOT get the group's absoluteposition here 
                     //or you'll experience a loop and/or a stack issue
                     GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
-                    GroupRotation = part.ParentGroup.Rotation;
+                    GroupRotation = part.ParentGroup.GroupRotation;
                     Position = part.ParentGroup.RootPart.AbsolutePosition;
                     Rotation = part.RotationOffset;
                     Scale = part.Shape.Scale;
@@ -98,7 +98,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
             if ((Type & UndoType.STATE_GROUP_SCALE) == 0 || ((last.Type & UndoType.STATE_GROUP_SCALE) >= (Type & UndoType.STATE_GROUP_SCALE)))
             {
-                Console.WriteLine("Setting groupscale to " + last.GroupScale.ToString());
                 GroupScale = last.GroupScale;
                 Scale = last.Scale;
             }
@@ -184,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (GroupChange)
                     {
                         part.ParentGroup.RootPart.Undoing = true;
-                        if (Position != Vector3.Zero)
+                        if (GroupPosition != Vector3.Zero)
                         {
                             //Calculate the scale...
                             Vector3 gs = part.Shape.Scale;
@@ -193,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
                             //Scale first since it can affect our position
                             part.ParentGroup.GroupResize(gs * scale, part.LocalId);
                             part.ParentGroup.AbsolutePosition = GroupPosition;
-                            part.ParentGroup.Rotation = GroupRotation;
+                            part.ParentGroup.UpdateGroupRotationR(GroupRotation);
                            
                         }
                         part.ParentGroup.RootPart.Undoing = false;

From 8849b9af8bd3260152dede0ccf61fd98137ef6c5 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sun, 4 Jul 2010 20:45:11 -0700
Subject: [PATCH 94/96] Fix single prim rotation undo.  All UNDO functions are
 now working correctly except for when the root prim is moved or rotated as a
 single prim (coming soon).

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 34712b82ab..7492601924 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3492,11 +3492,11 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
+                    part.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                     part.IgnoreUndoUpdate = true;
                     part.UpdateRotation(rot);
                     part.OffsetPosition = pos;
                     part.IgnoreUndoUpdate = false;
-                    part.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                 }
             }
         }

From be5dd04150bae69745de3cf5efde3d5be288dd71 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Mon, 5 Jul 2010 03:58:18 -0700
Subject: [PATCH 95/96] Bring "Redo" up to date with "Undo" so it works too

---
 OpenSim/Region/Framework/Scenes/UndoState.cs | 41 +++++---------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index f9601e6034..2af331693d 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Framework.Scenes
         public bool Compare(UndoState undo)
         {
             if (undo == null || Position == null) return false;
-            if (undo.Position == Position && undo.Rotation == Rotation  && undo.Scale == Scale && undo.GroupPosition == GroupPosition && undo.GroupScale == GroupScale && undo.GroupRotation == GroupRotation)
+            if (undo.Position == Position && undo.Rotation == Rotation && undo.Scale == Scale && undo.GroupPosition == GroupPosition && undo.GroupScale == GroupScale && undo.GroupRotation == GroupRotation)
             {
                 return true;
             }
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        public void PlaybackState(SceneObjectPart part)
+        private void RestoreState(SceneObjectPart part)
         {
             bool GroupChange = false;
             if ((Type & UndoType.STATE_GROUP_POSITION) != 0
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (part.ParentID == 0 && GroupChange == false)
                 {
                     if (Position != Vector3.Zero)
-                    part.ParentGroup.AbsolutePosition = Position;
+                        part.ParentGroup.AbsolutePosition = Position;
                     part.RotationOffset = Rotation;
                     if (Scale != Vector3.Zero)
                         part.Resize(Scale);
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Framework.Scenes
                             part.ParentGroup.GroupResize(gs * scale, part.LocalId);
                             part.ParentGroup.AbsolutePosition = GroupPosition;
                             part.ParentGroup.UpdateGroupRotationR(GroupRotation);
-                           
+
                         }
                         part.ParentGroup.RootPart.Undoing = false;
                     }
@@ -211,35 +211,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             }
         }
+        public void PlaybackState(SceneObjectPart part)
+        {
+            RestoreState(part);
+        }
         public void PlayfwdState(SceneObjectPart part)
         {
-            if (part != null)
-            {
-                part.Undoing = true;
-
-                if (part.ParentID == 0)
-                {
-                    if (Position != Vector3.Zero)
-                        part.ParentGroup.AbsolutePosition = Position;
-                    if (Rotation != Quaternion.Identity)
-                        part.UpdateRotation(Rotation);
-                    if (Scale != Vector3.Zero)
-                        part.Resize(Scale);
-                    part.ParentGroup.ScheduleGroupForTerseUpdate();
-                }
-                else
-                {
-                    if (Position != Vector3.Zero)
-                        part.OffsetPosition = Position;
-                    if (Rotation != Quaternion.Identity)
-                        part.UpdateRotation(Rotation);
-                    if (Scale != Vector3.Zero)
-                        part.Resize(Scale);
-                    part.ScheduleTerseUpdate();
-                }
-                part.Undoing = false;
-
-            }
+            RestoreState(part);
         }
     }
     public class LandUndoState
@@ -267,3 +245,4 @@ namespace OpenSim.Region.Framework.Scenes
         }
     }
 }
+

From e947d04038f7b42929368d9f7b6d440be139e675 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Mon, 5 Jul 2010 05:44:35 -0700
Subject: [PATCH 96/96] Undo fix is now complete. This commit repairs the
 special case of the root prim moving or rotating independently of the rest of
 the group.

---
 .../Framework/Scenes/SceneObjectGroup.cs      | 49 ++++++++++++++-----
 .../Framework/Scenes/SceneObjectPart.cs       |  2 -
 OpenSim/Region/Framework/Scenes/UndoState.cs  |  5 +-
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7492601924..f85d3d9396 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3386,10 +3386,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
             lockPartsForRead(false);
 
-            AbsolutePosition = newPos;
+            //We have to set undoing here because otherwise an undo state will be saved
+            if (!m_rootPart.Undoing)
+            {
+                m_rootPart.Undoing = true;
+                AbsolutePosition = newPos;
+                m_rootPart.Undoing = false;
+            }
+            else
+            {
+                AbsolutePosition = newPos;
+            }
 
             HasGroupChanged = true;
-            ScheduleGroupForTerseUpdate();
+            if (m_rootPart.Undoing)
+            {
+                ScheduleGroupForFullUpdate();
+            }
+            else
+            {
+                ScheduleGroupForTerseUpdate();
+            }
         }
 
         public void OffsetForNewRegion(Vector3 offset)
@@ -3488,7 +3505,16 @@ namespace OpenSim.Region.Framework.Scenes
                 if (part.UUID == m_rootPart.UUID)
                 {
                     UpdateRootRotation(rot);
-                    AbsolutePosition = pos;
+                    if (!m_rootPart.Undoing)
+                    {
+                        m_rootPart.Undoing = true;
+                        AbsolutePosition = pos;
+                        m_rootPart.Undoing = false;
+                    }
+                    else
+                    {
+                        AbsolutePosition = pos;
+                    }
                 }
                 else
                 {
@@ -3511,6 +3537,12 @@ namespace OpenSim.Region.Framework.Scenes
             Quaternion oldParentRot = m_rootPart.RotationOffset;
 
             m_rootPart.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
+            bool cancelUndo = false;
+            if (!m_rootPart.Undoing)
+            {
+                m_rootPart.Undoing = true;
+                cancelUndo = true;
+            }
             m_rootPart.UpdateRotation(rot);
             if (m_rootPart.PhysActor != null)
             {
@@ -3534,18 +3566,13 @@ namespace OpenSim.Region.Framework.Scenes
                     newRot *= Quaternion.Inverse(axRot);
                     prim.RotationOffset = newRot;
                     prim.ScheduleTerseUpdate();
+                    prim.IgnoreUndoUpdate = false;
                 }
             }
-
-            foreach (SceneObjectPart childpart in Children.Values)
+            if (cancelUndo == true)
             {
-                if (childpart != m_rootPart)
-                {
-                    childpart.IgnoreUndoUpdate = false;
-                    childpart.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
-                }
+                m_rootPart.Undoing = false;
             }
-
             lockPartsForRead(false);
 
             m_rootPart.ScheduleTerseUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 93a23cad0d..3327b1ef94 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3506,8 +3506,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
         public void StoreUndoState(UndoType type)
         {
-
-
             if (!Undoing && (m_parentGroup == null || m_parentGroup.RootPart == null || !m_parentGroup.RootPart.Undoing))
             {
                 if (!IgnoreUndoUpdate)
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 2af331693d..f71b507315 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -172,8 +172,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (part.ParentID == 0 && GroupChange == false)
                 {
                     if (Position != Vector3.Zero)
-                        part.ParentGroup.AbsolutePosition = Position;
-                    part.RotationOffset = Rotation;
+
+                    part.ParentGroup.UpdateSinglePosition(Position, part.LocalId);
+                    part.ParentGroup.UpdateSingleRotation(Rotation, part.LocalId);
                     if (Scale != Vector3.Zero)
                         part.Resize(Scale);
                     part.ParentGroup.ScheduleGroupForTerseUpdate();