diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IImprovedAssetCache.cs (renamed from OpenSim/Region/Framework/Interfaces/IAssetCache.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAssetCache.cs b/OpenSim/Region/Framework/Interfaces/IImprovedAssetCache.cs index bd43ce5..b213284 100644 --- a/OpenSim/Region/Framework/Interfaces/IAssetCache.cs +++ b/OpenSim/Region/Framework/Interfaces/IImprovedAssetCache.cs | |||
@@ -25,9 +25,15 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Framework; | ||
29 | |||
28 | namespace OpenSim.Region.Framework.Interfaces | 30 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 31 | { |
30 | public interface IImprovedAssetCache | 32 | public interface IImprovedAssetCache |
31 | { | 33 | { |
34 | void Cache(AssetBase asset); | ||
35 | AssetBase Get(string id); | ||
36 | void Expire(string id); | ||
37 | void Clear(); | ||
32 | } | 38 | } |
33 | } | 39 | } |
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 | ||