aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorDiva Canto2015-06-05 10:07:50 -0700
committerDiva Canto2015-06-05 10:07:50 -0700
commit96f0c6f074301484b44ce29c1a92ce13766f9883 (patch)
treee9d9d084d73ac32183dbf641e8053254645592ab /OpenSim/Region/CoreModules/Avatar
parentThe only purpose of this commit is to remove an erroneous comment. It turns o... (diff)
downloadopensim-SC_OLD-96f0c6f074301484b44ce29c1a92ce13766f9883.zip
opensim-SC_OLD-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.gz
opensim-SC_OLD-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.bz2
opensim-SC_OLD-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.xz
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
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
1 files changed, 8 insertions, 0 deletions
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
304 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name); 304 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
305 305
306 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments(); 306 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
307
308 // Let's get all items at once, so they get cached
309 UUID[] items = new UUID[attachments.Count];
310 int i = 0;
311 foreach (AvatarAttachment attach in attachments)
312 items[i++] = attach.ItemID;
313 m_scene.InventoryService.GetMultipleItems(sp.UUID, items);
314
307 foreach (AvatarAttachment attach in attachments) 315 foreach (AvatarAttachment attach in attachments)
308 { 316 {
309 uint attachmentPt = (uint)attach.AttachPoint; 317 uint attachmentPt = (uint)attach.AttachPoint;