diff options
author | Justin Clark-Casey (justincc) | 2012-04-07 00:40:55 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-07 00:40:55 +0100 |
commit | cce760dbfcd375a700e38b8279b0c19c5624e720 (patch) | |
tree | 901fb627f1237d36d5bcd25f0c23780ac6306b42 /OpenSim/Region/CoreModules/Framework | |
parent | Store FromItemID for attachments once on SOG instead of on every SOP and only... (diff) | |
download | opensim-SC_OLD-cce760dbfcd375a700e38b8279b0c19c5624e720.zip opensim-SC_OLD-cce760dbfcd375a700e38b8279b0c19c5624e720.tar.gz opensim-SC_OLD-cce760dbfcd375a700e38b8279b0c19c5624e720.tar.bz2 opensim-SC_OLD-cce760dbfcd375a700e38b8279b0c19c5624e720.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
654 | // | 654 | // |
655 | if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) | 655 | if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) |
656 | { | 656 | { |
657 | if (so.RootPart.FromFolderID != UUID.Zero && userID == remoteClient.AgentId) | 657 | if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId) |
658 | { | 658 | { |
659 | InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID); | 659 | InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); |
660 | folder = m_Scene.InventoryService.GetFolder(f); | 660 | folder = m_Scene.InventoryService.GetFolder(f); |
661 | } | 661 | } |
662 | } | 662 | } |
@@ -962,7 +962,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
962 | rootPart.SalePrice = item.SalePrice; | 962 | rootPart.SalePrice = item.SalePrice; |
963 | } | 963 | } |
964 | 964 | ||
965 | rootPart.FromFolderID = item.Folder; | 965 | so.FromFolderID = item.Folder; |
966 | 966 | ||
967 | // Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}", | 967 | // Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}", |
968 | // rootPart.OwnerID, item.Owner, item.CurrentPermissions); | 968 | // rootPart.OwnerID, item.Owner, item.CurrentPermissions); |