From 7d8bb33c5b2420d4e744269f67a25dd2b9746a35 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Apr 2012 00:33:02 +0100
Subject: Store FromItemID for attachments once on SOG instead of on every SOP
 and only ever using the root part entry.

This eliminates some pointless memory use.
---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 4dd89d2..88c21af 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1008,7 +1008,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 rootPart.TrimPermissions();
 
                 if (isAttachment)
-                    so.SetFromItemID(item.ID);
+                    so.FromItemID = item.ID;
             }
 
             return true;
-- 
cgit v1.1


From cce760dbfcd375a700e38b8279b0c19c5624e720 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Apr 2012 00:40:55 +0100
Subject: Rather than having a FromFolderID property on every single prim and
 only ever using the root prim one, store on SOG instead.

This reduces pointless memory usage.
---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 88c21af..8171487 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -654,9 +654,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 //
                 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
                 {
-                    if (so.RootPart.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
+                    if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
                     {
-                        InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID);
+                        InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
                         folder = m_Scene.InventoryService.GetFolder(f);
                     }
                 }
@@ -962,7 +962,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     rootPart.SalePrice = item.SalePrice;
                 }
 
-                rootPart.FromFolderID = item.Folder;
+                so.FromFolderID = item.Folder;
 
 //                Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}",
 //                                  rootPart.OwnerID, item.Owner, item.CurrentPermissions);
-- 
cgit v1.1