aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
index 1873a06..976714c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -38,7 +38,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
38 public class RegionLoaderFileSystem : IRegionLoader 38 public class RegionLoaderFileSystem : IRegionLoader
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 private IConfigSource m_configSource; 42 private IConfigSource m_configSource;
43 43
44 public void SetIniConfigSource(IConfigSource configSource) 44 public void SetIniConfigSource(IConfigSource configSource)
@@ -72,11 +72,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
72 72
73 // Create an empty Regions.ini if there are no existing config files. 73 // Create an empty Regions.ini if there are no existing config files.
74 if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0) 74 if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0)
75 { 75 {
76 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource); 76 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
77 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini"); 77 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
78 } 78 }
79 79
80 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath); 80 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
81 81
82 List<RegionInfo> regionInfos = new List<RegionInfo>(); 82 List<RegionInfo> regionInfos = new List<RegionInfo>();
@@ -85,16 +85,16 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
85 foreach (string file in iniFiles) 85 foreach (string file in iniFiles)
86 { 86 {
87 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file); 87 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
88 88
89 IConfigSource source = new IniConfigSource(file); 89 IConfigSource source = new IniConfigSource(file);
90 90
91 foreach (IConfig config in source.Configs) 91 foreach (IConfig config in source.Configs)
92 { 92 {
93 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name); 93 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
94 regionInfos.Add(regionInfo); 94 regionInfos.Add(regionInfo);
95 95
96 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName); 96 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
97 97
98 i++; 98 i++;
99 } 99 }
100 } 100 }
@@ -102,12 +102,12 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
102 foreach (string file in configFiles) 102 foreach (string file in configFiles)
103 { 103 {
104 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file); 104 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
105 105
106 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource); 106 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
107 regionInfos.Add(regionInfo); 107 regionInfos.Add(regionInfo);
108 108
109 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName); 109 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
110 110
111 i++; 111 i++;
112 } 112 }
113 113