diff options
| author | Justin Clark-Casey (justincc) | 2014-07-02 23:48:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-08-02 00:50:10 +0100 |
| commit | ba745a524d4f13552f8ed3827a7315b3000cbe53 (patch) | |
| tree | e0242a1495d2d3119a3559181186a1e16d61fd0a /OpenSim/Region/CoreModules | |
| parent | minor: Change default max phys prim size in code to match OpenSimDefaults.ini (diff) | |
| download | opensim-SC_OLD-ba745a524d4f13552f8ed3827a7315b3000cbe53.zip opensim-SC_OLD-ba745a524d4f13552f8ed3827a7315b3000cbe53.tar.gz opensim-SC_OLD-ba745a524d4f13552f8ed3827a7315b3000cbe53.tar.bz2 opensim-SC_OLD-ba745a524d4f13552f8ed3827a7315b3000cbe53.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> |