aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-19 21:18:03 +0000
committerJustin Clark-Casey (justincc)2010-02-19 21:18:03 +0000
commit214b1351fbd7287a70e465a4dd83668b1d2c7044 (patch)
tree2c9dab159fb9e5edcb96902888d8b35356df9711
parentChange handling of the SYSTEMIP constant to be more sane. (diff)
downloadopensim-SC_OLD-214b1351fbd7287a70e465a4dd83668b1d2c7044.zip
opensim-SC_OLD-214b1351fbd7287a70e465a4dd83668b1d2c7044.tar.gz
opensim-SC_OLD-214b1351fbd7287a70e465a4dd83668b1d2c7044.tar.bz2
opensim-SC_OLD-214b1351fbd7287a70e465a4dd83668b1d2c7044.tar.xz
minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/config-include/FlotsamCache.ini.example
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0b90b55..2ca2657 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11025,10 +11025,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11025 /// <param name="Pack">OpenMetaverse.packet</param> 11025 /// <param name="Pack">OpenMetaverse.packet</param>
11026 public void ProcessInPacket(Packet Pack) 11026 public void ProcessInPacket(Packet Pack)
11027 { 11027 {
11028// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack);
11029
11028 if (!ProcessPacketMethod(Pack)) 11030 if (!ProcessPacketMethod(Pack))
11029 {
11030 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 11031 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
11031 }
11032 11032
11033 PacketPool.Instance.ReturnPacket(Pack); 11033 PacketPool.Instance.ReturnPacket(Pack);
11034 } 11034 }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 9216e0b..967c0a1 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -69,7 +69,7 @@ namespace Flotsam.RegionModules.AssetCache
69 69
70 private readonly List<char> m_InvalidChars = new List<char>(); 70 private readonly List<char> m_InvalidChars = new List<char>();
71 71
72 private int m_LogLevel = 1; 72 private int m_LogLevel = 0;
73 private ulong m_HitRateDisplay = 1; // How often to display hit statistics, given in requests 73 private ulong m_HitRateDisplay = 1; // How often to display hit statistics, given in requests
74 74
75 private static ulong m_Requests; 75 private static ulong m_Requests;
@@ -156,7 +156,7 @@ namespace Flotsam.RegionModules.AssetCache
156 m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000); 156 m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000);
157#endif 157#endif
158 158
159 m_LogLevel = assetConfig.GetInt("LogLevel", 1); 159 m_LogLevel = assetConfig.GetInt("LogLevel", 0);
160 m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1000); 160 m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1000);
161 161
162 m_FileExpiration = TimeSpan.FromHours(assetConfig.GetDouble("FileCacheTimeout", m_DefaultFileExpiration)); 162 m_FileExpiration = TimeSpan.FromHours(assetConfig.GetDouble("FileCacheTimeout", m_DefaultFileExpiration));