aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-02-02 11:47:19 +0000
committerUbitUmarov2018-02-02 11:47:19 +0000
commita22606a89feee4bbd12612cb9a0325151836b84b (patch)
treecbe112fe194dbf8d1ee745fb6ef84850080e04c0
parenttry fix IAR load inventory links and objects owner (diff)
downloadopensim-SC_OLD-a22606a89feee4bbd12612cb9a0325151836b84b.zip
opensim-SC_OLD-a22606a89feee4bbd12612cb9a0325151836b84b.tar.gz
opensim-SC_OLD-a22606a89feee4bbd12612cb9a0325151836b84b.tar.bz2
opensim-SC_OLD-a22606a89feee4bbd12612cb9a0325151836b84b.tar.xz
do not timeout floatsam assets caching thread
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index f2fc070..c1bf544 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -809,7 +809,7 @@ namespace OpenSim.Region.CoreModules.Asset
809 809
810 return; 810 return;
811 } 811 }
812 catch (UnauthorizedAccessException e) 812 catch (UnauthorizedAccessException)
813 { 813 {
814 } 814 }
815 finally 815 finally
@@ -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