diff options
| author | Diva Canto | 2014-07-03 20:09:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-03 20:09:38 -0700 |
| commit | d0782c2bc0f4d4f644188deec7638efaf8e81514 (patch) | |
| tree | 3788483ff89a3134b98726d9cb782814aca9efc0 /OpenSim/Region/CoreModules | |
| parent | Avoid an exception in creating child agents some times. (diff) | |
| parent | Temporarily disable new regression test TestLifecycle() until I have a chance... (diff) | |
| download | opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.zip opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.gz opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.bz2 opensim-SC_OLD-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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> |