* Drop cached inventory from the local region when a user crosses out into a remote region

* May resolves inventory problems that occur when the user moves between two regions`
* e.g. if the user moves to a second region, adds an inventory item, moves back to the original region then tries to manipulate that item
* Not yet implemented for teleport

2 files changed, 21 insertions, 8 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 025b934..d85eda0 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Cache
         private readonly IList<IInventoryRequest> m_pendingRequests = new List<IInventoryRequest>();
 
         /// <summary>
-        /// The root folder of this user's inventory.  Returns null if the inventory has not yet been received.
+        /// The root folder of this user's inventory.  Returns null if the root folder has not yet been received.
         /// </summary>
         public InventoryFolderImpl RootFolder { get { return m_rootFolder; } }
         private InventoryFolderImpl m_rootFolder;
@@ -183,6 +183,21 @@ namespace OpenSim.Framework.Communications.Cache
                 }
             }
         }
+        
+        /// <summary>
+        /// Drop all cached inventory.
+        /// </summary>
+        public void DropInventory()
+        {
+            // Make sure there aren't pending requests around when we do this
+            // FIXME: There is still a race condition where an inventory operation can be requested (since these aren't being locked).
+            // Will have to extend locking to exclude this very soon.
+            lock (m_pendingRequests)
+            {
+                m_hasReceivedInventory = false;
+                m_rootFolder = null;
+            }
+        }
 
         /// <summary>
         /// Callback invoked when the inventory is received from an async request to the inventory service
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index ac52535..5045c97 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -118,21 +118,19 @@ namespace OpenSim.Framework.Communications.Cache
         /// </summary>
         /// <param name="userID"></param>
         /// <returns>true if the user was successfully removed, false otherwise</returns>
-        public bool RemoveUser(LLUUID userID)
+        public bool RemoveUser(LLUUID userId)
         {
             lock (m_userProfiles)
             {
-                if (m_userProfiles.ContainsKey(userID))
+                if (m_userProfiles.ContainsKey(userId))
                 {
-                    m_userProfiles.Remove(userID);
+                    m_log.DebugFormat("[USER CACHE]: Removing user {0}", userId);
+                    m_userProfiles.Remove(userId);
                     return true;
                 }
-                else
-                {
-                    m_log.ErrorFormat("[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userID);
-                }
             }
 
+            m_log.ErrorFormat("[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId);
             return false;
         }