diff options
| author | UbitUmarov | 2018-02-02 11:49:43 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-02-02 11:49:43 +0000 |
| commit | c70b77a52888f543e14a25061065f729a48d8526 (patch) | |
| tree | f12b95e75a5f5de86e82048b022952b85335c8e8 | |
| parent | let ossl have its own config section (diff) | |
| parent | do not timeout floatsam assets caching thread (diff) | |
| download | opensim-SC-c70b77a52888f543e14a25061065f729a48d8526.zip opensim-SC-c70b77a52888f543e14a25061065f729a48d8526.tar.gz opensim-SC-c70b77a52888f543e14a25061065f729a48d8526.tar.bz2 opensim-SC-c70b77a52888f543e14a25061065f729a48d8526.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 47ac188..c1bf544 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -1193,7 +1193,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 1193 | m_cleanupRunning = false; | 1193 | m_cleanupRunning = false; |
| 1194 | } | 1194 | } |
| 1195 | con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); | 1195 | con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); |
| 1196 | }, null, "TouchAllSceneAssets"); | 1196 | }, null, "TouchAllSceneAssets", false); |
| 1197 | 1197 | ||
| 1198 | break; | 1198 | break; |
| 1199 | 1199 | ||