diff options
| author | John Hurliman | 2009-10-21 16:24:17 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-21 16:24:17 -0700 |
| commit | 2b39ff0a39229f1cea513b12e6d093e31c40d0b2 (patch) | |
| tree | 9b5637ecf48129b025fafec5eeed19c852e13716 /OpenSim/Region/Application/OpenSim.cs | |
| parent | * FireQueueEmpty now checks if a measurable amount of time has passed, and if... (diff) | |
| parent | Fix llParticleSystem to accept LSL variables and LSL constants in place (diff) | |
| download | opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.zip opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.gz opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.bz2 opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.xz | |
Merged master into prioritization
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index ca6a2a3..143dd2a 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -628,8 +628,20 @@ namespace OpenSim | |||
| 628 | break; | 628 | break; |
| 629 | 629 | ||
| 630 | case "save": | 630 | case "save": |
| 631 | m_log.Info("Saving configuration file: " + Application.iniFilePath); | 631 | if (cmdparams.Length < 2) |
| 632 | m_config.Save(Application.iniFilePath); | 632 | { |
| 633 | m_log.Error("SYNTAX: " + n + " SAVE FILE"); | ||
| 634 | return; | ||
| 635 | } | ||
| 636 | |||
| 637 | if (Application.iniFilePath == cmdparams[1]) | ||
| 638 | { | ||
| 639 | m_log.Error("FILE can not be "+Application.iniFilePath); | ||
| 640 | return; | ||
| 641 | } | ||
| 642 | |||
| 643 | m_log.Info("Saving configuration file: " + cmdparams[1]); | ||
| 644 | m_config.Save(cmdparams[1]); | ||
| 633 | break; | 645 | break; |
| 634 | } | 646 | } |
| 635 | } | 647 | } |