aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-14 16:36:32 +0000
committerJustin Clarke Casey2009-04-14 16:36:32 +0000
commitad2bd740574b7695a74bb65a63c4bb884cafdf7d (patch)
tree4193c42afcd93ba2c26d717cb3d38654b0544365 /OpenSim/Region/Application
parent- adding Makefile.local to .gitignore (diff)
downloadopensim-SC_OLD-ad2bd740574b7695a74bb65a63c4bb884cafdf7d.zip
opensim-SC_OLD-ad2bd740574b7695a74bb65a63c4bb884cafdf7d.tar.gz
opensim-SC_OLD-ad2bd740574b7695a74bb65a63c4bb884cafdf7d.tar.bz2
opensim-SC_OLD-ad2bd740574b7695a74bb65a63c4bb884cafdf7d.tar.xz
* refactor: rename AssetCache.Initialize() to AssetCache.Reset() to avoid having Initialise() and Initialize() in the same class - very difficult to read.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index fd3549e..3840240 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -365,7 +365,7 @@ namespace OpenSim
365 catch 365 catch
366 { 366 {
367 } 367 }
368 m_log.Info("[OPENSIMBASE] Default assetserver will be used"); 368 m_log.Info("[OPENSIMBASE]: Default assetserver will be used");
369 break; 369 break;
370 } 370 }
371 371
@@ -428,6 +428,7 @@ namespace OpenSim
428 if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty) 428 if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty)
429 { 429 {
430 m_log.DebugFormat("[OPENSIMBASE]: Attempting to load asset cache id = {0}", m_configSettings.AssetCache); 430 m_log.DebugFormat("[OPENSIMBASE]: Attempting to load asset cache id = {0}", m_configSettings.AssetCache);
431
431 try 432 try
432 { 433 {
433 PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer); 434 PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer);
@@ -440,8 +441,8 @@ namespace OpenSim
440 } 441 }
441 catch (Exception e) 442 catch (Exception e)
442 { 443 {
443 m_log.Debug("[OPENSIMBASE]: ResolveAssetCache completed"); 444 m_log.Error("[OPENSIMBASE]: ResolveAssetCache failed");
444 m_log.Debug(e); 445 m_log.Error(e);
445 } 446 }
446 } 447 }
447 448
@@ -453,12 +454,12 @@ namespace OpenSim
453 { 454 {
454 if (LoginEnabled) 455 if (LoginEnabled)
455 { 456 {
456 m_log.Info("[Login]: Login is now enabled "); 457 m_log.Info("[LOGIN]: Login is now enabled.");
457 m_commsManager.GridService.RegionLoginsEnabled = true; 458 m_commsManager.GridService.RegionLoginsEnabled = true;
458 } 459 }
459 else 460 else
460 { 461 {
461 m_log.Info("[Login]: Login is now disabled "); 462 m_log.Info("[LOGIN]: Login is now disabled.");
462 m_commsManager.GridService.RegionLoginsEnabled = false; 463 m_commsManager.GridService.RegionLoginsEnabled = false;
463 } 464 }
464 } 465 }