Miscellaneous small tweaks and more logging messages to move towards resolving inventory problems

3 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 6a7be78..23bddcf 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -27,6 +27,7 @@
 */
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -61,12 +62,14 @@ namespace OpenSim.Framework.Communications.Cache
 
                     if (userInfo.UserProfile != null)
                     {
-                        RequestInventoryForUser(userID, userInfo);
+                        // The request itself will occur when the agent finishes logging on to the region
+                        // so there's no need to do it here.
+                        //RequestInventoryForUser(userID, userInfo);
                         m_userProfiles.Add(userID, userInfo);
                     }
                     else
                     {
-                        System.Console.WriteLine("CACHE", "User profile for user not found");
+                        MainLog.Instance.Error("USERCACHE", "User profile for user {0} not found", userID);
                     }
                 }
             }
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
index 3461474..a6b8819 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Data.MSSQL
         /// </summary>
         /// <param name="reader">The SQL Result</param>
         /// <returns>the item read</returns>
-        public InventoryItemBase readInventoryItem(IDataReader reader)
+        private InventoryItemBase readInventoryItem(IDataReader reader)
         {
             try
             {
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index ac0877e..a47a126 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -302,7 +302,7 @@ namespace OpenSim.Framework.Data.MySQL
         /// </summary>
         /// <param name="reader">The SQL Result</param>
         /// <returns>the item read</returns>
-        public InventoryItemBase readInventoryItem(MySqlDataReader reader)
+        private InventoryItemBase readInventoryItem(MySqlDataReader reader)
         {
             try
             {