diff options
author | Dr Scofield | 2008-08-21 11:04:57 +0000 |
---|---|---|
committer | Dr Scofield | 2008-08-21 11:04:57 +0000 |
commit | ff2eb24022f906ea20e673756d2b72162e707491 (patch) | |
tree | 8d28bafebf7530fd9f1ee291f3267b30fc2134bf /OpenSim/ApplicationPlugins/RemoteController | |
parent | fixing Rest/Inventory stuff again. changes somehow got lost locally. (diff) | |
download | opensim-SC-ff2eb24022f906ea20e673756d2b72162e707491.zip opensim-SC-ff2eb24022f906ea20e673756d2b72162e707491.tar.gz opensim-SC-ff2eb24022f906ea20e673756d2b72162e707491.tar.bz2 opensim-SC-ff2eb24022f906ea20e673756d2b72162e707491.tar.xz |
- corrects statement about {asset,user,inventory} source configuration
as those all work with MySQL (and are in fact required it seems);
adds examples as well
- adds region_file_template functionality for the create_region XmlRpc
call of RemoteAdminPlugin
- cleans up and fixes typo in UserProfileData
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index c79122c..ec28350 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -33,6 +33,7 @@ using System.Reflection; | |||
33 | using System.Timers; | 33 | using System.Timers; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Nini.Config; | ||
36 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
37 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
@@ -47,6 +48,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
47 | 48 | ||
48 | private OpenSimBase m_app; | 49 | private OpenSimBase m_app; |
49 | private BaseHttpServer m_httpd; | 50 | private BaseHttpServer m_httpd; |
51 | private IConfig m_config; | ||
50 | private string requiredPassword = String.Empty; | 52 | private string requiredPassword = String.Empty; |
51 | 53 | ||
52 | // TODO: required by IPlugin, but likely not at all right | 54 | // TODO: required by IPlugin, but likely not at all right |
@@ -69,8 +71,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
69 | if (openSim.ConfigSource.Source.Configs["RemoteAdmin"] != null && | 71 | if (openSim.ConfigSource.Source.Configs["RemoteAdmin"] != null && |
70 | openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetBoolean("enabled", false)) | 72 | openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetBoolean("enabled", false)) |
71 | { | 73 | { |
74 | m_config = openSim.ConfigSource.Source.Configs["RemoteAdmin"]; | ||
72 | m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); | 75 | m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); |
73 | requiredPassword = openSim.ConfigSource.Source.Configs["RemoteAdmin"].GetString("access_password", String.Empty); | 76 | requiredPassword = m_config.GetString("access_password", String.Empty); |
74 | 77 | ||
75 | m_app = openSim; | 78 | m_app = openSim; |
76 | m_httpd = openSim.HttpServer; | 79 | m_httpd = openSim.HttpServer; |
@@ -436,10 +439,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
436 | if (persist) | 439 | if (persist) |
437 | { | 440 | { |
438 | string regionConfigPath = Path.Combine(Path.Combine(Util.configDir(), "Regions"), | 441 | string regionConfigPath = Path.Combine(Path.Combine(Util.configDir(), "Regions"), |
439 | String.Format("{0}x{1}-{2}.xml", | 442 | String.Format(m_config.GetString("region_file_template", "{0}x{1}-{2}.xml"), |
440 | region.RegionLocX.ToString(), | 443 | region.RegionLocX.ToString(), |
441 | region.RegionLocY.ToString(), | 444 | region.RegionLocY.ToString(), |
442 | regionID.ToString())); | 445 | regionID.ToString(), |
446 | region.InternalEndPoint.Port.ToString(), | ||
447 | region.RegionName.Replace(" ", "_").Replace(":", "_").Replace("/", "_"))); | ||
443 | m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}", | 448 | m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}", |
444 | region.RegionID, regionConfigPath); | 449 | region.RegionID, regionConfigPath); |
445 | region.SaveRegionToFile("dynamic region", regionConfigPath); | 450 | region.SaveRegionToFile("dynamic region", regionConfigPath); |