From 1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 26 Jan 2013 18:03:18 +0100
Subject: Stop temp-on-rez object from being deleted while an avatar sits on
 them

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ed1bbd8..41f04e2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2023,7 +2023,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 (parcel.LandData.GroupID != GroupID ||
                                 parcel.LandData.GroupID == UUID.Zero))
                         {
-                            if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
+                            if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
                                     parcel.LandData.OtherCleanTime)
                             {
                                 DetachFromBackup();
-- 
cgit v1.1


From f1fbb774b6f08acde0c88618911dd4dc311217ad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 26 Jan 2013 20:39:17 +0100
Subject: Reinstate cleaning objects from parcel when avatars sit on them.
 Instead do it properly for temp-on-rez. Auto-return overrides sitting. Temp
 does not.

---
 OpenSim/Region/Framework/Scenes/Scene.cs            | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e3bc8c7..c7a38f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5122,7 +5122,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
                         {
-                            if (grp.RootPart.Expires <= DateTime.Now)
+                            if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now)
                                 DeleteSceneObject(grp, false);
                         }
                     }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 41f04e2..ed1bbd8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2023,7 +2023,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 (parcel.LandData.GroupID != GroupID ||
                                 parcel.LandData.GroupID == UUID.Zero))
                         {
-                            if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
+                            if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
                                     parcel.LandData.OtherCleanTime)
                             {
                                 DetachFromBackup();
-- 
cgit v1.1


From 380b017e3295eaf30a4a96c23faed5be78495256 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 27 Jan 2013 00:20:34 +0100
Subject: Prevent items being destroyed by rename operations. Renaming of a
 wearable also sends an asset transaciton but it is empty. So we can't ignore
 name data when a transaction is present and can't treat every transaction as
 valid.

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c9d1205..4130029 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -401,17 +401,17 @@ namespace OpenSim.Region.Framework.Scenes
                 if (item.Owner != remoteClient.AgentId)
                     return;
 
-                if (UUID.Zero == transactionID)
-                {
-                    item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
-                    item.Name = itemUpd.Name;
-                    item.Description = itemUpd.Description;
+                item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
+                item.Name = itemUpd.Name;
+                item.Description = itemUpd.Description;
 
 //                    m_log.DebugFormat(
 //                        "[USER INVENTORY]: itemUpd {0} {1} {2} {3}, item {4} {5} {6} {7}",
 //                        itemUpd.NextPermissions, itemUpd.GroupPermissions, itemUpd.EveryOnePermissions, item.Flags,
 //                        item.NextPermissions, item.GroupPermissions, item.EveryOnePermissions, item.CurrentPermissions);
 
+                if (itemUpd.NextPermissions != 0) // Use this to determine validity. Can never be 0 if valid
+                {
                     if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))
                         item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
                     item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
@@ -446,7 +446,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                     InventoryService.UpdateItem(item);
                 }
-                else
+
+                if (UUID.Zero != transactionID)
                 {
                     if (AgentTransactionsModule != null)
                     {
-- 
cgit v1.1