aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMW2008-06-26 17:23:05 +0000
committerMW2008-06-26 17:23:05 +0000
commit314181a70d00d99506d3752653f1b0b87512ea44 (patch)
treeb1d048f6635209506642256c082004981e1585e2 /OpenSim/ApplicationPlugins
parentAs per the suggestion on the mailing list, added support for a OpenSim.xml co... (diff)
downloadopensim-SC-314181a70d00d99506d3752653f1b0b87512ea44.zip
opensim-SC-314181a70d00d99506d3752653f1b0b87512ea44.tar.gz
opensim-SC-314181a70d00d99506d3752653f1b0b87512ea44.tar.bz2
opensim-SC-314181a70d00d99506d3752653f1b0b87512ea44.tar.xz
small change to last commit
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs8
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs4
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 01ea3eb..4b11fd4 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -51,7 +51,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
52 52
53 IRegionLoader regionLoader; 53 IRegionLoader regionLoader;
54 if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 54 if (openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
55 { 55 {
56 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); 56 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
57 regionLoader = new RegionLoaderFileSystem(); 57 regionLoader = new RegionLoaderFileSystem();
@@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
62 regionLoader = new RegionLoaderWebServer(); 62 regionLoader = new RegionLoaderWebServer();
63 } 63 }
64 64
65 regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource); 65 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
66 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 66 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
67 67
68 openSim.ModuleLoader.LoadDefaultSharedModules(); 68 openSim.ModuleLoader.LoadDefaultSharedModules();
@@ -89,7 +89,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
90 90
91 IRegionLoader regionLoader; 91 IRegionLoader regionLoader;
92 if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 92 if (openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
93 { 93 {
94 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); 94 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
95 regionLoader = new RegionLoaderFileSystem(); 95 regionLoader = new RegionLoaderFileSystem();
@@ -100,7 +100,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
100 regionLoader = new RegionLoaderWebServer(); 100 regionLoader = new RegionLoaderWebServer();
101 } 101 }
102 102
103 regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource); 103 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
104 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 104 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
105 for (int i = 0; i < regionsToLoad.Length; i++) 105 for (int i = 0; i < regionsToLoad.Length; i++)
106 { 106 {
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 947f833..5063375 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -58,11 +58,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
58 { 58 {
59 try 59 try
60 { 60 {
61 if (openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"] != null && 61 if (openSim.ConfigSource.Source.Configs["RemoteAdmin"] != null &&
62 openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) 62 openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetBoolean("enabled", false))
63 { 63 {
64 m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); 64 m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
65 requiredPassword = openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty); 65 requiredPassword = openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
66 66
67 m_app = openSim; 67 m_app = openSim;
68 m_httpd = openSim.HttpServer; 68 m_httpd = openSim.HttpServer;
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 60a7d27..4558d4d 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -203,7 +203,7 @@ namespace OpenSim.ApplicationPlugins.Rest
203 203
204 try 204 try
205 { 205 {
206 if ((_config = openSim.ConfigSource.ConfigSource.Configs["RestPlugins"]) == null) 206 if ((_config = openSim.ConfigSource.Source.Configs["RestPlugins"]) == null)
207 { 207 {
208 m_log.WarnFormat("{0} Rest Plugins not configured", MsgID); 208 m_log.WarnFormat("{0} Rest Plugins not configured", MsgID);
209 return; 209 return;
@@ -225,7 +225,7 @@ namespace OpenSim.ApplicationPlugins.Rest
225 _prefix = _config.GetString("prefix", "/admin"); 225 _prefix = _config.GetString("prefix", "/admin");
226 226
227 // Get plugin specific config 227 // Get plugin specific config
228 _pluginConfig = openSim.ConfigSource.ConfigSource.Configs[ConfigName]; 228 _pluginConfig = openSim.ConfigSource.Source.Configs[ConfigName];
229 229
230 230
231 m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); 231 m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID);