diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 45f6c7e..3675053 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | 34 | ||
35 | namespace OpenSim.Framework.Communications.Cache | 35 | namespace OpenSim.Framework.Communications.Cache |
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Each user has a cached profile. | 50 | /// Each user has a cached profile. |
51 | /// </summary> | 51 | /// </summary> |
52 | private readonly Dictionary<LLUUID, CachedUserInfo> m_userProfiles = new Dictionary<LLUUID, CachedUserInfo>(); | 52 | private readonly Dictionary<UUID, CachedUserInfo> m_userProfiles = new Dictionary<UUID, CachedUserInfo>(); |
53 | 53 | ||
54 | public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder(); | 54 | public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder(); |
55 | 55 | ||
@@ -63,9 +63,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
63 | /// A new user has moved into a region in this instance so retrieve their profile from the user service. | 63 | /// A new user has moved into a region in this instance so retrieve their profile from the user service. |
64 | /// </summary> | 64 | /// </summary> |
65 | /// <param name="userID"></param> | 65 | /// <param name="userID"></param> |
66 | public void AddNewUser(LLUUID userID) | 66 | public void AddNewUser(UUID userID) |
67 | { | 67 | { |
68 | if (userID == LLUUID.Zero) | 68 | if (userID == UUID.Zero) |
69 | return; | 69 | return; |
70 | m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); | 70 | m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); |
71 | GetUserDetails(userID); | 71 | GetUserDetails(userID); |
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="userID"></param> | 77 | /// <param name="userID"></param> |
78 | /// <returns>true if the user was successfully removed, false otherwise</returns> | 78 | /// <returns>true if the user was successfully removed, false otherwise</returns> |
79 | public bool RemoveUser(LLUUID userId) | 79 | public bool RemoveUser(UUID userId) |
80 | { | 80 | { |
81 | lock (m_userProfiles) | 81 | lock (m_userProfiles) |
82 | { | 82 | { |
@@ -99,7 +99,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
99 | /// </summary> | 99 | /// </summary> |
100 | /// <param name="userID"></param> | 100 | /// <param name="userID"></param> |
101 | /// <param name="userInfo"></param> | 101 | /// <param name="userInfo"></param> |
102 | public void RequestInventoryForUser(LLUUID userID) | 102 | public void RequestInventoryForUser(UUID userID) |
103 | { | 103 | { |
104 | CachedUserInfo userInfo = GetUserDetails(userID); | 104 | CachedUserInfo userInfo = GetUserDetails(userID); |
105 | if (userInfo != null) | 105 | if (userInfo != null) |
@@ -130,9 +130,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
130 | /// </summary> | 130 | /// </summary> |
131 | /// <param name="userID"></param> | 131 | /// <param name="userID"></param> |
132 | /// <returns>null if no user details are found</returns> | 132 | /// <returns>null if no user details are found</returns> |
133 | public CachedUserInfo GetUserDetails(LLUUID userID) | 133 | public CachedUserInfo GetUserDetails(UUID userID) |
134 | { | 134 | { |
135 | if (userID == LLUUID.Zero) | 135 | if (userID == UUID.Zero) |
136 | return null; | 136 | return null; |
137 | 137 | ||
138 | lock (m_userProfiles) | 138 | lock (m_userProfiles) |
@@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
164 | /// </summary> | 164 | /// </summary> |
165 | /// <param name="userID"></param> | 165 | /// <param name="userID"></param> |
166 | /// <param name="userData"></param> | 166 | /// <param name="userData"></param> |
167 | public void PreloadUserCache(LLUUID userID, UserProfileData userData) | 167 | public void PreloadUserCache(UUID userID, UserProfileData userData) |
168 | { | 168 | { |
169 | if (userID == LLUUID.Zero) | 169 | if (userID == UUID.Zero) |
170 | return; | 170 | return; |
171 | 171 | ||
172 | lock (m_userProfiles) | 172 | lock (m_userProfiles) |
@@ -192,8 +192,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
192 | /// <param name="folderType"></param> | 192 | /// <param name="folderType"></param> |
193 | /// <param name="folderName"></param> | 193 | /// <param name="folderName"></param> |
194 | /// <param name="parentID"></param> | 194 | /// <param name="parentID"></param> |
195 | public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, | 195 | public void HandleCreateInventoryFolder(IClientAPI remoteClient, UUID folderID, ushort folderType, |
196 | string folderName, LLUUID parentID) | 196 | string folderName, UUID parentID) |
197 | { | 197 | { |
198 | CachedUserInfo userProfile; | 198 | CachedUserInfo userProfile; |
199 | 199 | ||
@@ -226,8 +226,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
226 | /// <param name="type"></param> | 226 | /// <param name="type"></param> |
227 | /// <param name="name"></param> | 227 | /// <param name="name"></param> |
228 | /// <param name="parentID"></param> | 228 | /// <param name="parentID"></param> |
229 | public void HandleUpdateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort type, string name, | 229 | public void HandleUpdateInventoryFolder(IClientAPI remoteClient, UUID folderID, ushort type, string name, |
230 | LLUUID parentID) | 230 | UUID parentID) |
231 | { | 231 | { |
232 | // m_log.DebugFormat( | 232 | // m_log.DebugFormat( |
233 | // "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId); | 233 | // "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId); |
@@ -257,7 +257,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
257 | /// <param name="remoteClient"></param> | 257 | /// <param name="remoteClient"></param> |
258 | /// <param name="folderID"></param> | 258 | /// <param name="folderID"></param> |
259 | /// <param name="parentID"></param> | 259 | /// <param name="parentID"></param> |
260 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, LLUUID folderID, LLUUID parentID) | 260 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) |
261 | { | 261 | { |
262 | CachedUserInfo userProfile; | 262 | CachedUserInfo userProfile; |
263 | 263 | ||
@@ -287,7 +287,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
287 | /// <param name="fetchFolders"></param> | 287 | /// <param name="fetchFolders"></param> |
288 | /// <param name="fetchItems"></param> | 288 | /// <param name="fetchItems"></param> |
289 | /// <param name="sortOrder"></param> | 289 | /// <param name="sortOrder"></param> |
290 | public void HandleFetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, | 290 | public void HandleFetchInventoryDescendents(IClientAPI remoteClient, UUID folderID, UUID ownerID, |
291 | bool fetchFolders, bool fetchItems, int sortOrder) | 291 | bool fetchFolders, bool fetchItems, int sortOrder) |
292 | { | 292 | { |
293 | // FIXME MAYBE: We're not handling sortOrder! | 293 | // FIXME MAYBE: We're not handling sortOrder! |
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
327 | /// <param name="fetchItems"></param> | 327 | /// <param name="fetchItems"></param> |
328 | /// <param name="sortOrder"></param> | 328 | /// <param name="sortOrder"></param> |
329 | /// <returns>null if the inventory look up failed</returns> | 329 | /// <returns>null if the inventory look up failed</returns> |
330 | public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, | 330 | public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID, |
331 | bool fetchFolders, bool fetchItems, int sortOrder) | 331 | bool fetchFolders, bool fetchItems, int sortOrder) |
332 | { | 332 | { |
333 | // m_log.DebugFormat( | 333 | // m_log.DebugFormat( |
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
405 | /// </summary> | 405 | /// </summary> |
406 | /// <param name="remoteClient"></param> | 406 | /// <param name="remoteClient"></param> |
407 | /// <param name="folderID"></param> | 407 | /// <param name="folderID"></param> |
408 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) | 408 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) |
409 | { | 409 | { |
410 | CachedUserInfo userProfile; | 410 | CachedUserInfo userProfile; |
411 | 411 | ||
@@ -426,7 +426,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
426 | } | 426 | } |
427 | } | 427 | } |
428 | 428 | ||
429 | public void HandleFetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID) | 429 | public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID) |
430 | { | 430 | { |
431 | if (ownerID == libraryRoot.Owner) | 431 | if (ownerID == libraryRoot.Owner) |
432 | { | 432 | { |