From 96f0c6f074301484b44ce29c1a92ce13766f9883 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 5 Jun 2015 10:07:50 -0700 Subject: More on mantis #7567. Two things: - Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing - Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time --- .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 77abcd7..59c2179 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -304,6 +304,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name); List attachments = sp.Appearance.GetAttachments(); + + // Let's get all items at once, so they get cached + UUID[] items = new UUID[attachments.Count]; + int i = 0; + foreach (AvatarAttachment attach in attachments) + items[i++] = attach.ItemID; + m_scene.InventoryService.GetMultipleItems(sp.UUID, items); + foreach (AvatarAttachment attach in attachments) { uint attachmentPt = (uint)attach.AttachPoint; -- cgit v1.1