aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-11-18 03:18:23 +0000
committerUbitUmarov2019-11-18 03:18:23 +0000
commit3708f504a6be6740c60100ea4d13599e0d6c2792 (patch)
tree16b725941e52ab2d02304418ead0998d01aa6397 /OpenSim
parentMono addins uses this, and the version was now incompatible. (diff)
downloadopensim-SC-3708f504a6be6740c60100ea4d13599e0d6c2792.zip
opensim-SC-3708f504a6be6740c60100ea4d13599e0d6c2792.tar.gz
opensim-SC-3708f504a6be6740c60100ea4d13599e0d6c2792.tar.bz2
opensim-SC-3708f504a6be6740c60100ea4d13599e0d6c2792.tar.xz
fix a info message
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs2
-rwxr-xr-xOpenSim/Services/LLLoginService/LLLoginService.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 6e4a710..0fd3b66 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
330 330
331 private void SaveFileCacheForAsset(UUID AssetId, OpenJPEG.J2KLayerInfo[] Layers) 331 private void SaveFileCacheForAsset(UUID AssetId, OpenJPEG.J2KLayerInfo[] Layers)
332 { 332 {
333 m_decodedCache.AddOrUpdate(AssetId, Layers, TimeSpan.FromMinutes(10)); 333 m_decodedCache.AddOrUpdate(AssetId, Layers, TimeSpan.FromMinutes(1));
334 334
335 if (Cache != null) 335 if (Cache != null)
336 { 336 {
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index d4ec0e5..e7816c2 100755
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -292,7 +292,7 @@ namespace OpenSim.Services.LLLoginService
292 292
293 string processedMessage; 293 string processedMessage;
294 294
295 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", 295 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7} ",
296 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0); 296 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0);
297 297
298 string curMac = mac.ToString(); 298 string curMac = mac.ToString();