diff options
3 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 4aed338..714e279 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -218,9 +218,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
218 | /// <summary> | 218 | /// <summary> |
219 | /// Preloads User data into the region cache. Modules may use this service to add non-standard clients | 219 | /// Preloads User data into the region cache. Modules may use this service to add non-standard clients |
220 | /// </summary> | 220 | /// </summary> |
221 | /// <param name="userID"></param> | ||
222 | /// <param name="userData"></param> | 221 | /// <param name="userData"></param> |
223 | public void PreloadUserCache(UUID userID, UserProfileData userData) | 222 | public void PreloadUserCache(UserProfileData userData) |
224 | { | 223 | { |
225 | AddToCaches(userData); | 224 | AddToCaches(userData); |
226 | } | 225 | } |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 632ea83..43faead 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -777,7 +777,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
777 | //m_log.Debug("XXX---- EVERYTHING OK ---XXX"); | 777 | //m_log.Debug("XXX---- EVERYTHING OK ---XXX"); |
778 | 778 | ||
779 | // 1 - Preload the user data | 779 | // 1 - Preload the user data |
780 | m_userProfileCache.PreloadUserCache(userData.ID, userData); | 780 | m_userProfileCache.PreloadUserCache(userData); |
781 | 781 | ||
782 | if (m_knownRegions.ContainsKey(userData.ID)) | 782 | if (m_knownRegions.ContainsKey(userData.ID)) |
783 | { | 783 | { |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 8065f42..ad91d63 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -542,7 +542,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
542 | } | 542 | } |
543 | 543 | ||
544 | // Stick our data in the cache so the region will know something about us | 544 | // Stick our data in the cache so the region will know something about us |
545 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(agentData.AgentID, userProfile); | 545 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); |
546 | 546 | ||
547 | // Call 'new user' event handler | 547 | // Call 'new user' event handler |
548 | homeScene.NewUserConnection(agentData); | 548 | homeScene.NewUserConnection(agentData); |