From 9a7717743b7f7627bc80a69bb416838839062e72 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 11 Apr 2008 16:13:33 +0000
Subject: refactor: eliminate method in UserProfileCacheService

---
 .../Cache/UserProfileCacheService.cs               | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index d94ff6c..873070a 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -77,16 +77,25 @@ namespace OpenSim.Framework.Communications.Cache
                     }
                 }
             }
-        }
+        }            
 
-        public void UpdateUserInventory(LLUUID userID)
+        /// <summary>
+        /// Request the inventory data for the given user.  This will occur asynchronous if running on a grid
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="userInfo"></param>
+        public void RequestInventoryForUser(LLUUID userID)
         {
             CachedUserInfo userInfo = GetUserDetails(userID);
             if (userInfo != null)
+            {            
+                m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
+            }
+            else
             {
-                RequestInventoryForUser(userID, userInfo);
+                m_log.ErrorFormat("[USER CACHE]: RequestInventoryForUser() - user profile for user {0} not found", userID);
             }
-        }
+        }            
 
         public CachedUserInfo GetUserDetails(LLUUID userID)
         {
@@ -408,15 +417,5 @@ namespace OpenSim.Framework.Communications.Cache
                 }
             }
         }
-
-        /// <summary>
-        /// Request the inventory data for the given user.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="userInfo"></param>
-        private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
-        {
-            m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
-        }
     }
 }
-- 
cgit v1.1