From ac77c32453fdeffc03a5abbb6cbb037dfc1e7c0d Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 2 Dec 2007 20:43:21 +0000
Subject: Attempt to fix mantis issue #82, taking prims into inventory and then
 rezzing them in another region.

---
 OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 1 +
 OpenSim/Region/Environment/Scenes/ScenePresence.cs         | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 612930d..99d1b0f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.Communications.OGS1
                         request.ItemCallBack(userID, item);
                     }
                 }
+                m_RequestingInventory.Remove(userID);
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2ef27fd..145e15a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/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);
-- 
cgit v1.1