From 1be53b58a7a4c5b7a916c777cdee891b5a6dee26 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 9 Jun 2010 17:00:24 +0100
Subject: Give attachments the same priority as other avatars in
 BestAvatarResponsiveness policy

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 4780cdd..7b7677b 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -210,7 +210,10 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
                         if (physActor == null || !physActor.IsPhysical)
-                            priority+=100;
+                            priority += 100;
+
+                        if (((SceneObjectPart)entity).ParentGroup.RootPart.IsAttachment)
+                            priority = 1.0;
                     }
                     return priority;
                 }
-- 
cgit v1.1


From 8fc5eda2c913ea24125623ae4e529544417ee42a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 9 Jun 2010 10:55:37 -0700
Subject: Bug fix in attachments: when attaching from inworld the item's
 parentFolderID was wrong.

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index cc7b648..4180d5e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1736,7 +1736,11 @@ namespace OpenSim.Region.Framework.Scenes
                 item.AssetType = asset.Type;
                 item.InvType = (int)InventoryType.Object;
 
-                item.Folder = UUID.Zero; // Objects folder!
+                InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
+                if (folder != null)
+                    item.Folder = folder.ID;
+                else // oopsies
+                    item.Folder = UUID.Zero;
 
                 if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
                 {
-- 
cgit v1.1


From e80cb815df1a7e1f9e6effdcab438e0ce14f99eb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 9 Jun 2010 12:51:24 -0700
Subject: Bug fix on attachments: attach->drop->attach works now.

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 78c2566..e23f39f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1052,6 +1052,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             detachedpos = avatar.AbsolutePosition;
+            RootPart.FromItemID = UUID.Zero;
 
             AbsolutePosition = detachedpos;
             m_rootPart.AttachedAvatar = UUID.Zero;
-- 
cgit v1.1