diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Framework/IImprovedAssetCache.cs | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/IImprovedAssetCache.cs')
| -rw-r--r-- | OpenSim/Framework/IImprovedAssetCache.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IImprovedAssetCache.cs index 251215a..a0b8b55 100644 --- a/OpenSim/Framework/IImprovedAssetCache.cs +++ b/OpenSim/Framework/IImprovedAssetCache.cs | |||
| @@ -33,6 +33,7 @@ namespace OpenSim.Framework | |||
| 33 | { | 33 | { |
| 34 | void Cache(AssetBase asset); | 34 | void Cache(AssetBase asset); |
| 35 | AssetBase Get(string id); | 35 | AssetBase Get(string id); |
| 36 | bool Check(string id); | ||
| 36 | void Expire(string id); | 37 | void Expire(string id); |
| 37 | void Clear(); | 38 | void Clear(); |
| 38 | } | 39 | } |