diff options
author | Melanie Thielker | 2009-05-10 12:27:05 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-10 12:27:05 +0000 |
commit | d8e1842d2507b2c18b21671ed01496b3a2c59e18 (patch) | |
tree | 2ae57cf45dd1b22fe48b72b85c952258d87f60b6 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
parent | Fix the build break (diff) | |
download | opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.zip opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.gz opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.bz2 opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.xz |
Add some asset cache plumbing. Change the generic cache from UUID to string
keys to allow caching the new crop of URI identified objects.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 246cf55..e46545c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -624,8 +624,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
624 | // a new friend was added in the initiator's and friend's data, so the cache entries are wrong now. | 624 | // a new friend was added in the initiator's and friend's data, so the cache entries are wrong now. |
625 | lock (m_friendLists) | 625 | lock (m_friendLists) |
626 | { | 626 | { |
627 | m_friendLists.Invalidate(fromAgentID); | 627 | m_friendLists.Invalidate(fromAgentID.ToString()); |
628 | m_friendLists.Invalidate(toAgentID); | 628 | m_friendLists.Invalidate(toAgentID.ToString()); |
629 | } | 629 | } |
630 | 630 | ||
631 | // now send presence update and add a calling card for the new friend | 631 | // now send presence update and add a calling card for the new friend |
@@ -664,8 +664,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
664 | // The cache entries aren't valid anymore either, as we just added a friend to both sides. | 664 | // The cache entries aren't valid anymore either, as we just added a friend to both sides. |
665 | lock (m_friendLists) | 665 | lock (m_friendLists) |
666 | { | 666 | { |
667 | m_friendLists.Invalidate(agentID); | 667 | m_friendLists.Invalidate(agentID.ToString()); |
668 | m_friendLists.Invalidate(friendID); | 668 | m_friendLists.Invalidate(friendID.ToString()); |
669 | } | 669 | } |
670 | 670 | ||
671 | // if it's a local friend, we don't have to do the lookup | 671 | // if it's a local friend, we don't have to do the lookup |
@@ -782,8 +782,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
782 | // clean up cache: FriendList is wrong now... | 782 | // clean up cache: FriendList is wrong now... |
783 | lock (m_friendLists) | 783 | lock (m_friendLists) |
784 | { | 784 | { |
785 | m_friendLists.Invalidate(agentID); | 785 | m_friendLists.Invalidate(agentID.ToString()); |
786 | m_friendLists.Invalidate(exfriendID); | 786 | m_friendLists.Invalidate(exfriendID.ToString()); |
787 | } | 787 | } |
788 | } | 788 | } |
789 | 789 | ||
@@ -1070,7 +1070,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
1070 | List<FriendListItem> fl; | 1070 | List<FriendListItem> fl; |
1071 | lock (m_friendLists) | 1071 | lock (m_friendLists) |
1072 | { | 1072 | { |
1073 | fl = (List<FriendListItem>)m_friendLists.Get(agent.ControllingClient.AgentId, | 1073 | fl = (List<FriendListItem>)m_friendLists.Get(agent.ControllingClient.AgentId.ToString(), |
1074 | m_initialScene.GetFriendList); | 1074 | m_initialScene.GetFriendList); |
1075 | } | 1075 | } |
1076 | 1076 | ||
@@ -1083,7 +1083,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
1083 | List<FriendListItem> fl; | 1083 | List<FriendListItem> fl; |
1084 | lock (m_friendLists) | 1084 | lock (m_friendLists) |
1085 | { | 1085 | { |
1086 | fl = (List<FriendListItem>)m_friendLists.Get(remoteClient.AgentId, | 1086 | fl = (List<FriendListItem>)m_friendLists.Get(remoteClient.AgentId.ToString(), |
1087 | m_initialScene.GetFriendList); | 1087 | m_initialScene.GetFriendList); |
1088 | } | 1088 | } |
1089 | 1089 | ||