diff options
Diffstat (limited to 'OpenSim/Framework')
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 @@ | |||
27 | */ | 27 | */ |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Console; | ||
30 | 31 | ||
31 | namespace OpenSim.Framework.Communications.Cache | 32 | namespace OpenSim.Framework.Communications.Cache |
32 | { | 33 | { |
@@ -61,12 +62,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
61 | 62 | ||
62 | if (userInfo.UserProfile != null) | 63 | if (userInfo.UserProfile != null) |
63 | { | 64 | { |
64 | RequestInventoryForUser(userID, userInfo); | 65 | // The request itself will occur when the agent finishes logging on to the region |
66 | // so there's no need to do it here. | ||
67 | //RequestInventoryForUser(userID, userInfo); | ||
65 | m_userProfiles.Add(userID, userInfo); | 68 | m_userProfiles.Add(userID, userInfo); |
66 | } | 69 | } |
67 | else | 70 | else |
68 | { | 71 | { |
69 | System.Console.WriteLine("CACHE", "User profile for user not found"); | 72 | MainLog.Instance.Error("USERCACHE", "User profile for user {0} not found", userID); |
70 | } | 73 | } |
71 | } | 74 | } |
72 | } | 75 | } |
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 | |||
286 | /// </summary> | 286 | /// </summary> |
287 | /// <param name="reader">The SQL Result</param> | 287 | /// <param name="reader">The SQL Result</param> |
288 | /// <returns>the item read</returns> | 288 | /// <returns>the item read</returns> |
289 | public InventoryItemBase readInventoryItem(IDataReader reader) | 289 | private InventoryItemBase readInventoryItem(IDataReader reader) |
290 | { | 290 | { |
291 | try | 291 | try |
292 | { | 292 | { |
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 | |||
302 | /// </summary> | 302 | /// </summary> |
303 | /// <param name="reader">The SQL Result</param> | 303 | /// <param name="reader">The SQL Result</param> |
304 | /// <returns>the item read</returns> | 304 | /// <returns>the item read</returns> |
305 | public InventoryItemBase readInventoryItem(MySqlDataReader reader) | 305 | private InventoryItemBase readInventoryItem(MySqlDataReader reader) |
306 | { | 306 | { |
307 | try | 307 | try |
308 | { | 308 | { |