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/Region/CoreModules/Asset/CoreAssetCache.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/Region/CoreModules/Asset/CoreAssetCache.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index 9742a5c..58ce61a 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | |||
| @@ -112,6 +112,10 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 112 | //////////////////////////////////////////////////////////// | 112 | //////////////////////////////////////////////////////////// |
| 113 | // IImprovedAssetCache | 113 | // IImprovedAssetCache |
| 114 | // | 114 | // |
| 115 | public bool Check(string id) | ||
| 116 | { | ||
| 117 | return false; | ||
| 118 | } | ||
| 115 | 119 | ||
| 116 | public void Cache(AssetBase asset) | 120 | public void Cache(AssetBase asset) |
| 117 | { | 121 | { |