diff options
author | Justin Clark-Casey (justincc) | 2014-07-02 23:48:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-02 23:49:25 +0100 |
commit | 889194db63016ad4b9ecb0c6ae82d3d9c7632c95 (patch) | |
tree | 823eba42a9ce5fcb04b8c7e1ff6e50deedc726f6 /OpenSim/Region/CoreModules | |
parent | minor: Change default max phys prim size in code to match OpenSimDefaults.ini (diff) | |
download | opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.zip opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.gz opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.bz2 opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.xz |
Actually call Close() for shared region modules when the simulator is being shutdown.
Adds regression test for this case.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs index 9b0e1f4..ebec9d2 100644 --- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | |||
@@ -316,9 +316,12 @@ namespace OpenSim.Region.CoreModules.Asset | |||
316 | /// </summary> | 316 | /// </summary> |
317 | public void Close() | 317 | public void Close() |
318 | { | 318 | { |
319 | m_enabled = false; | 319 | if (m_enabled) |
320 | m_cache.Clear(); | 320 | { |
321 | m_cache = null; | 321 | m_enabled = false; |
322 | m_cache.Clear(); | ||
323 | m_cache = null; | ||
324 | } | ||
322 | } | 325 | } |
323 | 326 | ||
324 | /// <summary> | 327 | /// <summary> |