aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 82c95c2..98032cb 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -565,6 +565,9 @@ namespace OpenSim.Region.CoreModules.Asset
565 /// <param name="purgeLine"></param> 565 /// <param name="purgeLine"></param>
566 private void CleanExpiredFiles(string dir, DateTime purgeLine) 566 private void CleanExpiredFiles(string dir, DateTime purgeLine)
567 { 567 {
568 // Yet another "directory we are trying to remove doesn't exist, so don't complain" idiocy fix.
569 if (!Directory.Exists(dir))
570 return;
568 try 571 try
569 { 572 {
570 foreach (string file in Directory.GetFiles(dir)) 573 foreach (string file in Directory.GetFiles(dir))
@@ -596,8 +599,7 @@ namespace OpenSim.Region.CoreModules.Asset
596 } 599 }
597 catch (Exception e) 600 catch (Exception e)
598 { 601 {
599 m_log.Warn( 602 m_log.Warn(string.Format("[FLOTSAM ASSET CACHE]: Could not complete clean of expired files in {0}", dir), e);
600 string.Format("[FLOTSAM ASSET CACHE]: Could not complete clean of expired files in {0}, exception ", dir), e);
601 } 603 }
602 } 604 }
603 605
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index b838177..e384632 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1660,9 +1660,9 @@ namespace OpenSim.Region.Framework.Scenes
1660 if (item != null) 1660 if (item != null)
1661 { 1661 {
1662 part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID); 1662 part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID);
1663 m_log.InfoFormat( 1663//// m_log.InfoFormat(
1664 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 1664//// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
1665 item.Name, primLocalID, remoteClient.Name); 1665//// item.Name, primLocalID, remoteClient.Name);
1666 part.SendPropertiesToClient(remoteClient); 1666 part.SendPropertiesToClient(remoteClient);
1667 if (!Permissions.BypassPermissions()) 1667 if (!Permissions.BypassPermissions())
1668 { 1668 {