From 412112acbafa6e1f111b12007fd3a81728d0b2f5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 23 Mar 2009 00:11:34 +0000
Subject: Committing partial work on passing folders across instances. This may
 crash.

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9528114..d129b93 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -618,6 +618,13 @@ namespace OpenSim.Region.Framework.Scenes
                 return null;
             }
 
+            if (!recipientUserInfo.HasReceivedInventory)
+            {
+                recipientUserInfo.FetchInventory();
+                if (!WaitForInventory(recipientUserInfo))
+                    return null;
+            }
+
             if (recipientParentFolderId == UUID.Zero)
                 recipientParentFolderId = recipientUserInfo.RootFolder.ID;
 
-- 
cgit v1.1