6 files changed, 179 insertions, 99 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d16b73b..51f6c5e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1757,6 +1757,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (group != null)
             {
+                group.HasGroupChanged = true;
                 group.ProcessBackup(SimulationDataService, true);
             }
         }
@@ -2345,13 +2346,12 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (!softDelete)
                 {
-                    // Force a database update so that the scene object group ID is accurate.  It's possible that the
-                    // group has recently been delinked from another group but that this change has not been persisted
-                    // to the DB.
+                    // If the group contains prims whose SceneGroupID is incorrect then force a
+                    // database update, because RemoveObject() works by searching on the SceneGroupID.
                     // This is an expensive thing to do so only do it if absolutely necessary.
-                    if (so.HasGroupChangedDueToDelink)
-                        ForceSceneObjectBackup(so);                
-                    
+                    if (so.GroupContainsForeignPrims)
+                        ForceSceneObjectBackup(so);
+
                     so.DetachFromBackup();
                     SimulationDataService.RemoveObject(so.UUID, RegionInfo.RegionID);
                 }
@@ -3413,6 +3413,7 @@ namespace OpenSim.Region.Framework.Scenes
             // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport
 
             // Don't disable this log message - it's too helpful
+            string curViewer = Util.GetViewerName(acd);
             m_log.DebugFormat(
                 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
                 RegionInfo.RegionName,
@@ -3422,7 +3423,7 @@ namespace OpenSim.Region.Framework.Scenes
                 acd.AgentID,
                 acd.circuitcode,
                 acd.IPAddress,
-                acd.Viewer,
+                curViewer,
                 ((TPFlags)teleportFlags).ToString(),
                 acd.startpos
             );
@@ -3442,7 +3443,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_AllowedViewers)
                 {
-                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, viewer.Length).Trim().ToLower())
                     {
                         ViewerDenied = false;
                         break;
@@ -3459,7 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_BannedViewers)
                 {
-                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == curViewer.Substring(0, viewer.Length).Trim().ToLower())
                     {
                         ViewerDenied = true;
                         break;
@@ -3471,7 +3472,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.DebugFormat(
                     "[SCENE]: Access denied for {0} {1} using {2}",
-                    acd.firstname, acd.lastname, acd.Viewer);
+                    acd.firstname, acd.lastname, curViewer);
                 reason = "Access denied, your viewer is banned by the region owner";
                 return false;
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6f26176..b70e9df 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -150,12 +150,27 @@ namespace OpenSim.Region.Framework.Scenes
 
             get { return m_hasGroupChanged; }
         }
+
+        private bool m_groupContainsForeignPrims = false;
         
         /// <summary>
-        /// Has the group changed due to an unlink operation?  We record this in order to optimize deletion, since
-        /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
+        /// Whether the group contains prims that came from a different group. This happens when
+        /// linking or delinking groups. The implication is that until the group is persisted,
+        /// the prims in the database still use the old SceneGroupID. That's a problem if the group
+        /// is deleted, because we delete groups by searching for prims by their SceneGroupID.
         /// </summary>
-        public bool HasGroupChangedDueToDelink { get; private set; }
+        public bool GroupContainsForeignPrims
+        {
+            private set
+            {
+                m_groupContainsForeignPrims = value;
+                if (m_groupContainsForeignPrims)
+                    HasGroupChanged = true;
+            }
+
+            get { return m_groupContainsForeignPrims; }
+        }
+
 
         private bool isTimeToPersist()
         {
@@ -1624,7 +1639,7 @@ namespace OpenSim.Region.Framework.Scenes
                         backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity;
                         backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem;
                         HasGroupChanged = false;
-                        HasGroupChangedDueToDelink = false;
+                        GroupContainsForeignPrims = false;
 
                         m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
                         datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
@@ -1686,28 +1701,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
             dupe.Backup = false;
             dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
-
-            // Warning, The following code related to previousAttachmentStatus is needed so that clones of 
-            // attachments do not bordercross while they're being duplicated.  This is hacktastic!
-            // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region!
-            // unless IsAttachment is true!, so to prevent border crossing, we save it's attachment state 
-            // (which should be false anyway) set it as an Attachment and then set it's Absolute Position, 
-            // then restore it's attachment state
-
-            // This is only necessary when userExposed is false!
-
-            bool previousAttachmentStatus = dupe.IsAttachment;
-            
-            if (!userExposed)
-                dupe.IsAttachment = true;
-
             dupe.m_sittingAvatars = new List<UUID>();
-
-            if (!userExposed)
-            {
-                dupe.IsAttachment = previousAttachmentStatus;
-            }
-
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
 
@@ -2388,6 +2382,8 @@ namespace OpenSim.Region.Framework.Scenes
             // If linking prims with different permissions, fix them
             AdjustChildPrimPermissions();
 
+            GroupContainsForeignPrims = true;
+
             AttachToBackup();
 
             // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the 
@@ -2531,9 +2527,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             linkPart.Rezzed = RootPart.Rezzed;
 
-            // When we delete a group, we currently have to force persist to the database if the object id has changed
-            // (since delete works by deleting all rows which have a given object id)
-            objectGroup.HasGroupChangedDueToDelink = true;
+            // We must persist the delinked group to the database immediately, for safety. The problem
+            // is that although in memory the new group has a new SceneGroupID, in the database it
+            // still has the parent group's SceneGroupID (until the next backup). This means that if the
+            // parent group is deleted then the delinked group will also be deleted from the database.
+            // This problem will disappear if the region remains alive long enough for another backup,
+            // since at that time the delinked group's new SceneGroupID will be written to the database.
+            // But if the region crashes before that then the prims will be permanently gone, and this must
+            // not happen. (We can't use a just-in-time trick like GroupContainsForeignPrims in this case
+            // because the delinked group doesn't know when the source group is deleted.)
+            m_scene.ForceSceneObjectBackup(objectGroup);
 
             return objectGroup;
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 491d0bf..64c464d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string Viewer
         {
-            get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
+            get { return Util.GetViewerName(m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode)); }
         }
 
         #endregion
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 5cb271d..a556f9d 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -119,21 +119,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 return output;
             }
         }
-        
+
         public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
         {
 //            m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
             
             coa = null;
-            int i = 0;
             
-            using (StringReader sr = new StringReader(xml))
-            {                
-                using (XmlTextReader reader = new XmlTextReader(sr))
-                {
-                    try
+            try
+            {
+                // Quickly check if this is a coalesced object, without fully parsing the XML
+                using (StringReader sr = new StringReader(xml))
+                {                
+                    using (XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.Read();
+                        reader.MoveToContent(); // skip possible xml declaration
+
                         if (reader.Name != "CoalescedObject")
                         {
     //                        m_log.DebugFormat(
@@ -142,49 +143,49 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                             
                             return false;
                         }
-                        
-                        coa = new CoalescedSceneObjects(UUID.Zero);                    
-                        reader.Read();                                            
-                        
-                        while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
-                        {
-                            if (reader.Name == "SceneObjectGroup")
-                            {
-                                string soXml = reader.ReadOuterXml();
-
-                                SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(soXml);
-
-                                if (so != null)
-                                {
-                                    coa.Add(so);
-                                }
-                                else
-                                {
-                                    // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
-                                    // coalesced object fails to load.
-                                    m_log.WarnFormat(
-                                        "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
-                                        i);
-                                }
+                    }
+                }
 
-                                i++;
-                            }
-                        }
+                XmlDocument doc = new XmlDocument();
+                doc.LoadXml(xml);
+                XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+                if (e == null)
+                    return false;
                         
-                        reader.ReadEndElement(); // CoalescedObject
+                coa = new CoalescedSceneObjects(UUID.Zero);
+
+                XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
+                int i = 0;
+                
+                foreach (XmlNode n in groups)
+                {
+                    SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                    if (so != null)
+                    {
+                        coa.Add(so);
                     }
-                    catch (Exception e)
+                    else
                     {
-                        m_log.ErrorFormat(
-                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}", 
-                            e.Message, e.StackTrace);
-                        
-                        return false;
-                    }                        
+                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
+                        // coalesced object fails to load.
+                        m_log.WarnFormat(
+                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
+                            i);
+                    }
+
+                    i++;
                 }
             }
+            catch (Exception e)
+            {
+                m_log.Error(string.Format(
+                    "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} ", 
+                    e.Message), e);
+                        
+                return false;
+            }                        
             
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index f07dee9..a93f3c8 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -299,6 +299,73 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
+        
+        /// <summary>
+        /// Modifies a SceneObjectGroup.
+        /// </summary>
+        /// <param name="sog">The object</param>
+        /// <returns>Whether the object was actually modified</returns>
+        public delegate bool SceneObjectModifier(SceneObjectGroup sog);
+        
+        /// <summary>
+        /// Modifies an object by deserializing it; applying 'modifier' to each SceneObjectGroup; and reserializing.
+        /// </summary>
+        /// <param name="assetId">The object's UUID</param>
+        /// <param name="data">Serialized data</param>
+        /// <param name="modifier">The function to run on each SceneObjectGroup</param>
+        /// <returns>The new serialized object's data, or null if an error occurred</returns>
+        public static byte[] ModifySerializedObject(UUID assetId, byte[] data, SceneObjectModifier modifier)
+        {
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+            CoalescedSceneObjects coa = null;
+
+            string xmlData = Utils.BytesToString(data);
+            
+            if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa))
+            {
+                // m_log.DebugFormat("[SERIALIZER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count);
+
+                if (coa.Objects.Count == 0)
+                {
+                    m_log.WarnFormat("[SERIALIZER]: Aborting load of coalesced object from asset {0} as it has zero loaded components", assetId);
+                    return null;
+                }
+
+                sceneObjects.AddRange(coa.Objects);
+            }
+            else
+            {
+                SceneObjectGroup deserializedObject = FromOriginalXmlFormat(xmlData);
+
+                if (deserializedObject != null)
+                {
+                    sceneObjects.Add(deserializedObject);
+                }
+                else
+                {
+                    m_log.WarnFormat("[SERIALIZER]: Aborting load of object from asset {0} as deserialization failed", assetId);
+                    return null;
+                }
+            }
+
+            bool modified = false;
+            foreach (SceneObjectGroup sog in sceneObjects)
+            {
+                if (modifier(sog))
+                    modified = true;
+            }
+
+            if (modified)
+            {
+                if (coa != null)
+                    data = Utils.StringToBytes(CoalescedSceneObjectsSerializer.ToXml(coa));
+                else
+                    data = Utils.StringToBytes(ToOriginalXmlFormat(sceneObjects[0]));
+            }
+
+            return data;
+        }
+
 
         #region manual serialization
 
@@ -1230,7 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 if (m_UserManagement == null)
                     m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>();
                 string name = m_UserManagement.GetUserName(sop.CreatorID);
-                writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
+                writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
             }
 
             WriteUUID(writer, "FolderID", sop.FolderID, options);
@@ -1403,7 +1470,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                         if (m_UserManagement == null)
                             m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
                         string name = m_UserManagement.GetUserName(item.CreatorID);
-                        writer.WriteElementString("CreatorData", (string)options["home"] + ";" + name);
+                        writer.WriteElementString("CreatorData", ExternalRepresentationUtils.CalcCreatorData((string)options["home"], name));
                     }
 
                     writer.WriteElementString("Description", item.Description);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 9378e20..c928b1e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -91,7 +91,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp2.RootPart.ClearUpdateSchedule();
 
             // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
+            Assert.IsFalse(grp1.GroupContainsForeignPrims);
             grp1.LinkToGroup(grp2);
+            Assert.IsTrue(grp1.GroupContainsForeignPrims);
+
+            scene.Backup(true);
+            Assert.IsFalse(grp1.GroupContainsForeignPrims);
 
             // FIXME: Can't do this test yet since group 2 still has its root part!  We can't yet null this since
             // it might cause SOG.ProcessBackup() to fail due to the race condition.  This really needs to be fixed.
@@ -143,7 +148,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(grp1.Parts.Length, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
             Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
-            Assert.That(grp3.HasGroupChangedDueToDelink, Is.True);
         }
 
         [Test]
@@ -335,30 +339,34 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectPart rootPart
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = rootPartName, UUID = rootPartUuid };
+            
             SceneObjectPart linkPart
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
                     { Name = linkPartName, UUID = linkPartUuid };
+            SceneObjectGroup linkGroup = new SceneObjectGroup(linkPart);
+            scene.AddNewSceneObject(linkGroup, true);
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
-            sog.AddPart(linkPart);
-            scene.AddNewSceneObject(sog, true);            
-            
-            // In a test, we have to crank the backup handle manually.  Normally this would be done by the timer invoked
-            // scene backup thread.
+            scene.AddNewSceneObject(sog, true);
+
+            Assert.IsFalse(sog.GroupContainsForeignPrims);
+            sog.LinkToGroup(linkGroup);
+            Assert.IsTrue(sog.GroupContainsForeignPrims);
+
             scene.Backup(true);
-                        
+            Assert.AreEqual(1, scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID).Count);
+
             // These changes should occur immediately without waiting for a backup pass
             SceneObjectGroup groupToDelete = sog.DelinkFromGroup(linkPart, false);
-            
-            Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.True);
+            Assert.IsFalse(groupToDelete.GroupContainsForeignPrims);
+
             scene.DeleteSceneObject(groupToDelete, false);
-            Assert.That(groupToDelete.HasGroupChangedDueToDelink, Is.False);
             
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
-            
-            Assert.That(storedObjects.Count, Is.EqualTo(1));
-            Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(1));
-            Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
+
+            Assert.AreEqual(1, storedObjects.Count);
+            Assert.AreEqual(1, storedObjects[0].Parts.Length);
+            Assert.IsTrue(storedObjects[0].ContainsPart(rootPartUuid));
         }
     }
 }