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/Framework/Scenes/Scene.cs | |
parent | Fix the build break (diff) | |
download | opensim-SC-d8e1842d2507b2c18b21671ed01496b3a2c59e18.zip opensim-SC-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.gz opensim-SC-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.bz2 opensim-SC-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/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d1260d4..7cb66a0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2825,8 +2825,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2825 | objectCapacity = objects; | 2825 | objectCapacity = objects; |
2826 | } | 2826 | } |
2827 | 2827 | ||
2828 | public List<FriendListItem> GetFriendList(UUID avatarID) | 2828 | public List<FriendListItem> GetFriendList(string id) |
2829 | { | 2829 | { |
2830 | UUID avatarID; | ||
2831 | if (!UUID.TryParse(id, out avatarID)) | ||
2832 | return new List<FriendListItem>(); | ||
2833 | |||
2830 | return CommsManager.GetUserFriendList(avatarID); | 2834 | return CommsManager.GetUserFriendList(avatarID); |
2831 | } | 2835 | } |
2832 | 2836 | ||