Attempt to fix mantis issue #82, taking prims into inventory and then rezzing them in another region.

OpenSim/Framework/Communications/Cache/CachedUserInfo.cs

@@ -54,38 +54,50 @@ namespace OpenSim.Framework.Communications.Cache
                     }
                 }
                 else if (RootFolder.folderID == folderInfo.parentID)
+                {
+                    if (!RootFolder.SubFolders.ContainsKey(folderInfo.folderID))
                     {
                         RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
                     }
+                }
                 else
                 {
                     InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.parentID);
                     if (folder != null)
+                    {
+                        if (!folder.SubFolders.ContainsKey(folderInfo.folderID))
                         {
                             folder.SubFolders.Add(folderInfo.folderID, folderInfo);
                         }
                     }
                 }
             }
+        }
 
         public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
         {
             if ((userID == UserProfile.UUID) && (RootFolder != null))
             {
                 if (itemInfo.parentFolderID == RootFolder.folderID)
+                {
+                    if (!RootFolder.Items.ContainsKey(itemInfo.inventoryID))
                     {
                         RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
                     }
+                }
                 else
                 {
                     InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.parentFolderID);
                     if (folder != null)
+                    {
+                        if (!folder.Items.ContainsKey(itemInfo.inventoryID))
                         {
                             folder.Items.Add(itemInfo.inventoryID, itemInfo);
                         }
                     }
                 }
             }
+        }
 
         public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
         {

OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs

@@ -72,6 +72,15 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
+        public void UpdateUserInventory(LLUUID userID)
+        {
+            CachedUserInfo userInfo = GetUserDetails(userID);
+            if (userInfo != null)
+            {
+                RequestInventoryForUser(userID, userInfo);
+            }
+        }
+
         public CachedUserInfo GetUserDetails(LLUUID userID)
         {
             if (m_userProfiles.ContainsKey(userID))

OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs

@@ -106,6 +106,7 @@ namespace OpenSim.Region.Communications.OGS1
                         request.ItemCallBack(userID, item);
                     }
                 }
+                m_RequestingInventory.Remove(userID);
             }
         }
 

OpenSim/Region/Environment/Scenes/ScenePresence.cs

@@ -425,6 +425,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void MakeRootAgent(LLVector3 pos, bool isFlying)
         {
+
             m_newAvatar = true;
             m_isChildAgent = false;
 
@@ -433,6 +434,7 @@ namespace OpenSim.Region.Environment.Scenes
             AddToPhysicalScene();
             m_physicsActor.Flying = isFlying;
 
+            m_scene.CommsManager.UserProfileCacheService.UpdateUserInventory(m_uuid);
             //if (!m_gotAllObjectsInScene)
             //{
                 //m_scene.SendAllSceneObjectsToClient(this);