diff options
author | Melanie | 2012-11-22 13:37:27 +0000 |
---|---|---|
committer | Melanie | 2012-11-22 13:37:27 +0000 |
commit | 3c1a58c67a9162480054674ae8c83f5b501576db (patch) | |
tree | 7864eb3dd4aea66bd41b49a43a810c6c623c2485 /OpenSim/Region/Application | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Factor out command script code. (diff) | |
download | opensim-SC_OLD-3c1a58c67a9162480054674ae8c83f5b501576db.zip opensim-SC_OLD-3c1a58c67a9162480054674ae8c83f5b501576db.tar.gz opensim-SC_OLD-3c1a58c67a9162480054674ae8c83f5b501576db.tar.bz2 opensim-SC_OLD-3c1a58c67a9162480054674ae8c83f5b501576db.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 185 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 67 |
3 files changed, 30 insertions, 223 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 8d95c41..fc3999f 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -188,7 +188,6 @@ namespace OpenSim | |||
188 | // Make sure command line options take precedence | 188 | // Make sure command line options take precedence |
189 | m_config.Source.Merge(argvSource); | 189 | m_config.Source.Merge(argvSource); |
190 | 190 | ||
191 | |||
192 | IConfig enVars = m_config.Source.Configs["Environment"]; | 191 | IConfig enVars = m_config.Source.Configs["Environment"]; |
193 | 192 | ||
194 | if( enVars != null ) | 193 | if( enVars != null ) |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 4c4abb6..7cafc5d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -82,8 +82,8 @@ namespace OpenSim | |||
82 | { | 82 | { |
83 | base.ReadExtraConfigSettings(); | 83 | base.ReadExtraConfigSettings(); |
84 | 84 | ||
85 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 85 | IConfig startupConfig = Config.Configs["Startup"]; |
86 | IConfig networkConfig = m_config.Source.Configs["Network"]; | 86 | IConfig networkConfig = Config.Configs["Network"]; |
87 | 87 | ||
88 | int stpMaxThreads = 15; | 88 | int stpMaxThreads = 15; |
89 | 89 | ||
@@ -106,22 +106,6 @@ namespace OpenSim | |||
106 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); | 106 | m_timeInterval = startupConfig.GetInt("timer_Interval", 1200); |
107 | } | 107 | } |
108 | 108 | ||
109 | if (m_logFileAppender != null) | ||
110 | { | ||
111 | if (m_logFileAppender is log4net.Appender.FileAppender) | ||
112 | { | ||
113 | log4net.Appender.FileAppender appender = | ||
114 | (log4net.Appender.FileAppender)m_logFileAppender; | ||
115 | string fileName = startupConfig.GetString("LogFile", String.Empty); | ||
116 | if (fileName != String.Empty) | ||
117 | { | ||
118 | appender.File = fileName; | ||
119 | appender.ActivateOptions(); | ||
120 | } | ||
121 | m_log.InfoFormat("[LOGGING]: Logging started to file {0}", appender.File); | ||
122 | } | ||
123 | } | ||
124 | |||
125 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); | 109 | string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty); |
126 | FireAndForgetMethod asyncCallMethod; | 110 | FireAndForgetMethod asyncCallMethod; |
127 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) | 111 | if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod)) |
@@ -164,7 +148,7 @@ namespace OpenSim | |||
164 | break; | 148 | break; |
165 | case "rest": | 149 | case "rest": |
166 | m_console = new RemoteConsole("Region"); | 150 | m_console = new RemoteConsole("Region"); |
167 | ((RemoteConsole)m_console).ReadConfig(m_config.Source); | 151 | ((RemoteConsole)m_console).ReadConfig(Config); |
168 | break; | 152 | break; |
169 | default: | 153 | default: |
170 | m_console = new LocalConsole("Region"); | 154 | m_console = new LocalConsole("Region"); |
@@ -174,6 +158,7 @@ namespace OpenSim | |||
174 | 158 | ||
175 | MainConsole.Instance = m_console; | 159 | MainConsole.Instance = m_console; |
176 | 160 | ||
161 | RegisterCommonAppenders(Config.Configs["Startup"]); | ||
177 | RegisterConsoleCommands(); | 162 | RegisterConsoleCommands(); |
178 | 163 | ||
179 | base.StartupSpecific(); | 164 | base.StartupSpecific(); |
@@ -372,26 +357,6 @@ namespace OpenSim | |||
372 | "restart", | 357 | "restart", |
373 | "Restart all sims in this instance", RunCommand); | 358 | "Restart all sims in this instance", RunCommand); |
374 | 359 | ||
375 | m_console.Commands.AddCommand("General", false, "config set", | ||
376 | "config set <section> <key> <value>", | ||
377 | "Set a config option. In most cases this is not useful since changed parameters are not dynamically reloaded. Neither do changed parameters persist - you will have to change a config file manually and restart.", HandleConfig); | ||
378 | |||
379 | m_console.Commands.AddCommand("General", false, "config get", | ||
380 | "config get [<section>] [<key>]", | ||
381 | "Synonym for config show", | ||
382 | HandleConfig); | ||
383 | |||
384 | m_console.Commands.AddCommand("General", false, "config show", | ||
385 | "config show [<section>] [<key>]", | ||
386 | "Show config information", | ||
387 | "If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine | ||
388 | + "If a section is given but not a field, then all fields in that section are printed.", | ||
389 | HandleConfig); | ||
390 | |||
391 | m_console.Commands.AddCommand("General", false, "config save", | ||
392 | "config save <path>", | ||
393 | "Save current configuration to a file at the given path", HandleConfig); | ||
394 | |||
395 | m_console.Commands.AddCommand("General", false, "command-script", | 360 | m_console.Commands.AddCommand("General", false, "command-script", |
396 | "command-script <script>", | 361 | "command-script <script>", |
397 | "Run a command script from file", RunCommand); | 362 | "Run a command script from file", RunCommand); |
@@ -502,35 +467,6 @@ namespace OpenSim | |||
502 | } | 467 | } |
503 | 468 | ||
504 | /// <summary> | 469 | /// <summary> |
505 | /// Run an optional startup list of commands | ||
506 | /// </summary> | ||
507 | /// <param name="fileName"></param> | ||
508 | private void RunCommandScript(string fileName) | ||
509 | { | ||
510 | if (File.Exists(fileName)) | ||
511 | { | ||
512 | m_log.Info("[COMMANDFILE]: Running " + fileName); | ||
513 | |||
514 | using (StreamReader readFile = File.OpenText(fileName)) | ||
515 | { | ||
516 | string currentCommand; | ||
517 | while ((currentCommand = readFile.ReadLine()) != null) | ||
518 | { | ||
519 | currentCommand = currentCommand.Trim(); | ||
520 | if (!(currentCommand == "" | ||
521 | || currentCommand.StartsWith(";") | ||
522 | || currentCommand.StartsWith("//") | ||
523 | || currentCommand.StartsWith("#"))) | ||
524 | { | ||
525 | m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'"); | ||
526 | m_console.RunCommand(currentCommand); | ||
527 | } | ||
528 | } | ||
529 | } | ||
530 | } | ||
531 | } | ||
532 | |||
533 | /// <summary> | ||
534 | /// Opens a file and uses it as input to the console command parser. | 470 | /// Opens a file and uses it as input to the console command parser. |
535 | /// </summary> | 471 | /// </summary> |
536 | /// <param name="fileName">name of file to use as input to the console</param> | 472 | /// <param name="fileName">name of file to use as input to the console</param> |
@@ -634,111 +570,9 @@ namespace OpenSim | |||
634 | bool changed = PopulateRegionEstateInfo(regInfo); | 570 | bool changed = PopulateRegionEstateInfo(regInfo); |
635 | IScene scene; | 571 | IScene scene; |
636 | CreateRegion(regInfo, true, out scene); | 572 | CreateRegion(regInfo, true, out scene); |
637 | if (changed) | ||
638 | regInfo.EstateSettings.Save(); | ||
639 | } | ||
640 | 573 | ||
641 | /// <summary> | 574 | if (changed) |
642 | /// Change and load configuration file data. | 575 | regInfo.EstateSettings.Save(); |
643 | /// </summary> | ||
644 | /// <param name="module"></param> | ||
645 | /// <param name="cmd"></param> | ||
646 | private void HandleConfig(string module, string[] cmd) | ||
647 | { | ||
648 | List<string> args = new List<string>(cmd); | ||
649 | args.RemoveAt(0); | ||
650 | string[] cmdparams = args.ToArray(); | ||
651 | |||
652 | if (cmdparams.Length > 0) | ||
653 | { | ||
654 | string firstParam = cmdparams[0].ToLower(); | ||
655 | |||
656 | switch (firstParam) | ||
657 | { | ||
658 | case "set": | ||
659 | if (cmdparams.Length < 4) | ||
660 | { | ||
661 | Notice("Syntax: config set <section> <key> <value>"); | ||
662 | Notice("Example: config set ScriptEngine.DotNetEngine NumberOfScriptThreads 5"); | ||
663 | } | ||
664 | else | ||
665 | { | ||
666 | IConfig c; | ||
667 | IConfigSource source = new IniConfigSource(); | ||
668 | c = source.AddConfig(cmdparams[1]); | ||
669 | if (c != null) | ||
670 | { | ||
671 | string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3); | ||
672 | c.Set(cmdparams[2], _value); | ||
673 | m_config.Source.Merge(source); | ||
674 | |||
675 | Notice("In section [{0}], set {1} = {2}", c.Name, cmdparams[2], _value); | ||
676 | } | ||
677 | } | ||
678 | break; | ||
679 | |||
680 | case "get": | ||
681 | case "show": | ||
682 | if (cmdparams.Length == 1) | ||
683 | { | ||
684 | foreach (IConfig config in m_config.Source.Configs) | ||
685 | { | ||
686 | Notice("[{0}]", config.Name); | ||
687 | string[] keys = config.GetKeys(); | ||
688 | foreach (string key in keys) | ||
689 | Notice(" {0} = {1}", key, config.GetString(key)); | ||
690 | } | ||
691 | } | ||
692 | else if (cmdparams.Length == 2 || cmdparams.Length == 3) | ||
693 | { | ||
694 | IConfig config = m_config.Source.Configs[cmdparams[1]]; | ||
695 | if (config == null) | ||
696 | { | ||
697 | Notice("Section \"{0}\" does not exist.",cmdparams[1]); | ||
698 | break; | ||
699 | } | ||
700 | else | ||
701 | { | ||
702 | if (cmdparams.Length == 2) | ||
703 | { | ||
704 | Notice("[{0}]", config.Name); | ||
705 | foreach (string key in config.GetKeys()) | ||
706 | Notice(" {0} = {1}", key, config.GetString(key)); | ||
707 | } | ||
708 | else | ||
709 | { | ||
710 | Notice( | ||
711 | "config get {0} {1} : {2}", | ||
712 | cmdparams[1], cmdparams[2], config.GetString(cmdparams[2])); | ||
713 | } | ||
714 | } | ||
715 | } | ||
716 | else | ||
717 | { | ||
718 | Notice("Syntax: config {0} [<section>] [<key>]", firstParam); | ||
719 | Notice("Example: config {0} ScriptEngine.DotNetEngine NumberOfScriptThreads", firstParam); | ||
720 | } | ||
721 | |||
722 | break; | ||
723 | |||
724 | case "save": | ||
725 | if (cmdparams.Length < 2) | ||
726 | { | ||
727 | Notice("Syntax: config save <path>"); | ||
728 | return; | ||
729 | } | ||
730 | |||
731 | if (Application.iniFilePath == cmdparams[1]) | ||
732 | { | ||
733 | Notice("Path can not be " + Application.iniFilePath); | ||
734 | return; | ||
735 | } | ||
736 | |||
737 | Notice("Saving configuration file: " + cmdparams[1]); | ||
738 | m_config.Save(cmdparams[1]); | ||
739 | break; | ||
740 | } | ||
741 | } | ||
742 | } | 576 | } |
743 | 577 | ||
744 | /// <summary> | 578 | /// <summary> |
@@ -787,13 +621,6 @@ namespace OpenSim | |||
787 | 621 | ||
788 | switch (command) | 622 | switch (command) |
789 | { | 623 | { |
790 | case "command-script": | ||
791 | if (cmdparams.Length > 0) | ||
792 | { | ||
793 | RunCommandScript(cmdparams[0]); | ||
794 | } | ||
795 | break; | ||
796 | |||
797 | case "backup": | 624 | case "backup": |
798 | MainConsole.Instance.Output("Triggering save of pending object updates to persistent store"); | 625 | MainConsole.Instance.Output("Triggering save of pending object updates to persistent store"); |
799 | SceneManager.BackupCurrentScene(); | 626 | SceneManager.BackupCurrentScene(); |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7bef1aa..eb4326e 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -104,13 +104,7 @@ namespace OpenSim | |||
104 | /// <value> | 104 | /// <value> |
105 | /// The config information passed into the OpenSimulator region server. | 105 | /// The config information passed into the OpenSimulator region server. |
106 | /// </value> | 106 | /// </value> |
107 | public OpenSimConfigSource ConfigSource | 107 | public OpenSimConfigSource ConfigSource { get; private set; } |
108 | { | ||
109 | get { return m_config; } | ||
110 | set { m_config = value; } | ||
111 | } | ||
112 | |||
113 | protected OpenSimConfigSource m_config; | ||
114 | 108 | ||
115 | public List<IClientNetworkServer> ClientServers | 109 | public List<IClientNetworkServer> ClientServers |
116 | { | 110 | { |
@@ -150,13 +144,14 @@ namespace OpenSim | |||
150 | protected virtual void LoadConfigSettings(IConfigSource configSource) | 144 | protected virtual void LoadConfigSettings(IConfigSource configSource) |
151 | { | 145 | { |
152 | m_configLoader = new ConfigurationLoader(); | 146 | m_configLoader = new ConfigurationLoader(); |
153 | m_config = m_configLoader.LoadConfigSettings(configSource, envConfigSource, out m_configSettings, out m_networkServersInfo); | 147 | ConfigSource = m_configLoader.LoadConfigSettings(configSource, envConfigSource, out m_configSettings, out m_networkServersInfo); |
148 | Config = ConfigSource.Source; | ||
154 | ReadExtraConfigSettings(); | 149 | ReadExtraConfigSettings(); |
155 | } | 150 | } |
156 | 151 | ||
157 | protected virtual void ReadExtraConfigSettings() | 152 | protected virtual void ReadExtraConfigSettings() |
158 | { | 153 | { |
159 | IConfig networkConfig = m_config.Source.Configs["Network"]; | 154 | IConfig networkConfig = Config.Configs["Network"]; |
160 | if (networkConfig != null) | 155 | if (networkConfig != null) |
161 | { | 156 | { |
162 | proxyUrl = networkConfig.GetString("proxy_url", ""); | 157 | proxyUrl = networkConfig.GetString("proxy_url", ""); |
@@ -189,7 +184,7 @@ namespace OpenSim | |||
189 | /// </summary> | 184 | /// </summary> |
190 | protected override void StartupSpecific() | 185 | protected override void StartupSpecific() |
191 | { | 186 | { |
192 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 187 | IConfig startupConfig = Config.Configs["Startup"]; |
193 | if (startupConfig != null) | 188 | if (startupConfig != null) |
194 | { | 189 | { |
195 | string pidFile = startupConfig.GetString("PIDFile", String.Empty); | 190 | string pidFile = startupConfig.GetString("PIDFile", String.Empty); |
@@ -205,7 +200,7 @@ namespace OpenSim | |||
205 | } | 200 | } |
206 | 201 | ||
207 | // Load the simulation data service | 202 | // Load the simulation data service |
208 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; | 203 | IConfig simDataConfig = Config.Configs["SimulationDataStore"]; |
209 | if (simDataConfig == null) | 204 | if (simDataConfig == null) |
210 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); | 205 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
211 | 206 | ||
@@ -213,7 +208,7 @@ namespace OpenSim | |||
213 | if (String.IsNullOrEmpty(module)) | 208 | if (String.IsNullOrEmpty(module)) |
214 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); | 209 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); |
215 | 210 | ||
216 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); | 211 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { Config }); |
217 | if (m_simulationDataService == null) | 212 | if (m_simulationDataService == null) |
218 | throw new Exception( | 213 | throw new Exception( |
219 | string.Format( | 214 | string.Format( |
@@ -221,7 +216,7 @@ namespace OpenSim | |||
221 | module)); | 216 | module)); |
222 | 217 | ||
223 | // Load the estate data service | 218 | // Load the estate data service |
224 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; | 219 | IConfig estateDataConfig = Config.Configs["EstateDataStore"]; |
225 | if (estateDataConfig == null) | 220 | if (estateDataConfig == null) |
226 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); | 221 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
227 | 222 | ||
@@ -229,7 +224,7 @@ namespace OpenSim | |||
229 | if (String.IsNullOrEmpty(module)) | 224 | if (String.IsNullOrEmpty(module)) |
230 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); | 225 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); |
231 | 226 | ||
232 | m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { m_config.Source }); | 227 | m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { Config }); |
233 | if (m_estateDataService == null) | 228 | if (m_estateDataService == null) |
234 | throw new Exception( | 229 | throw new Exception( |
235 | string.Format( | 230 | string.Format( |
@@ -257,7 +252,7 @@ namespace OpenSim | |||
257 | } | 252 | } |
258 | } | 253 | } |
259 | 254 | ||
260 | protected virtual void AddPluginCommands(CommandConsole console) | 255 | protected virtual void AddPluginCommands(ICommandConsole console) |
261 | { | 256 | { |
262 | List<string> topics = GetHelpTopics(); | 257 | List<string> topics = GetHelpTopics(); |
263 | 258 | ||
@@ -384,7 +379,7 @@ namespace OpenSim | |||
384 | } | 379 | } |
385 | 380 | ||
386 | IClientNetworkServer clientServer; | 381 | IClientNetworkServer clientServer; |
387 | Scene scene = SetupScene(regionInfo, proxyOffset, m_config.Source, out clientServer); | 382 | Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServer); |
388 | 383 | ||
389 | m_log.Info("[MODULES]: Loading Region's modules (old style)"); | 384 | m_log.Info("[MODULES]: Loading Region's modules (old style)"); |
390 | 385 | ||
@@ -530,10 +525,10 @@ namespace OpenSim | |||
530 | string estateOwnerPassword = null; | 525 | string estateOwnerPassword = null; |
531 | string rawEstateOwnerUuid = null; | 526 | string rawEstateOwnerUuid = null; |
532 | 527 | ||
533 | if (m_config.Source.Configs[ESTATE_SECTION_NAME] != null) | 528 | if (Config.Configs[ESTATE_SECTION_NAME] != null) |
534 | { | 529 | { |
535 | string defaultEstateOwnerName | 530 | string defaultEstateOwnerName |
536 | = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerName", "").Trim(); | 531 | = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerName", "").Trim(); |
537 | string[] ownerNames = defaultEstateOwnerName.Split(' '); | 532 | string[] ownerNames = defaultEstateOwnerName.Split(' '); |
538 | 533 | ||
539 | if (ownerNames.Length >= 2) | 534 | if (ownerNames.Length >= 2) |
@@ -543,9 +538,9 @@ namespace OpenSim | |||
543 | } | 538 | } |
544 | 539 | ||
545 | // Info to be used only on Standalone Mode | 540 | // Info to be used only on Standalone Mode |
546 | rawEstateOwnerUuid = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerUUID", null); | 541 | rawEstateOwnerUuid = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerUUID", null); |
547 | estateOwnerEMail = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerEMail", null); | 542 | estateOwnerEMail = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerEMail", null); |
548 | estateOwnerPassword = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null); | 543 | estateOwnerPassword = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateOwnerPassword", null); |
549 | } | 544 | } |
550 | 545 | ||
551 | MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName); | 546 | MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName); |
@@ -797,7 +792,7 @@ namespace OpenSim | |||
797 | return new Scene( | 792 | return new Scene( |
798 | regionInfo, circuitManager, sceneGridService, | 793 | regionInfo, circuitManager, sceneGridService, |
799 | simDataService, estateDataService, false, | 794 | simDataService, estateDataService, false, |
800 | m_config.Source, m_version); | 795 | Config, m_version); |
801 | } | 796 | } |
802 | 797 | ||
803 | protected void ShutdownClientServer(RegionInfo whichRegion) | 798 | protected void ShutdownClientServer(RegionInfo whichRegion) |
@@ -838,7 +833,7 @@ namespace OpenSim | |||
838 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier) | 833 | protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier) |
839 | { | 834 | { |
840 | return GetPhysicsScene( | 835 | return GetPhysicsScene( |
841 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, m_config.Source, osSceneIdentifier); | 836 | m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier); |
842 | } | 837 | } |
843 | 838 | ||
844 | /// <summary> | 839 | /// <summary> |
@@ -1075,9 +1070,9 @@ namespace OpenSim | |||
1075 | 1070 | ||
1076 | string defaultEstateName = null; | 1071 | string defaultEstateName = null; |
1077 | 1072 | ||
1078 | if (m_config.Source.Configs[ESTATE_SECTION_NAME] != null) | 1073 | if (Config.Configs[ESTATE_SECTION_NAME] != null) |
1079 | { | 1074 | { |
1080 | defaultEstateName = m_config.Source.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateName", null); | 1075 | defaultEstateName = Config.Configs[ESTATE_SECTION_NAME].GetString("DefaultEstateName", null); |
1081 | 1076 | ||
1082 | if (defaultEstateName != null) | 1077 | if (defaultEstateName != null) |
1083 | { | 1078 | { |
@@ -1160,28 +1155,14 @@ namespace OpenSim | |||
1160 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); | 1155 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); |
1161 | } | 1156 | } |
1162 | } | 1157 | } |
1163 | } | 1158 | } |
1164 | 1159 | ||
1165 | return true; // need to update the database | 1160 | return true; // need to update the database |
1166 | } | 1161 | } |
1167 | } | 1162 | } |
1168 | 1163 | ||
1169 | public class OpenSimConfigSource | 1164 | public class OpenSimConfigSource |
1170 | { | 1165 | { |
1171 | public IConfigSource Source; | 1166 | public IConfigSource Source; |
1172 | |||
1173 | public void Save(string path) | ||
1174 | { | ||
1175 | if (Source is IniConfigSource) | ||
1176 | { | ||
1177 | IniConfigSource iniCon = (IniConfigSource) Source; | ||
1178 | iniCon.Save(path); | ||
1179 | } | ||
1180 | else if (Source is XmlConfigSource) | ||
1181 | { | ||
1182 | XmlConfigSource xmlCon = (XmlConfigSource) Source; | ||
1183 | xmlCon.Save(path); | ||
1184 | } | ||
1185 | } | ||
1186 | } | 1167 | } |
1187 | } | 1168 | } \ No newline at end of file |