diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 10071a0..f070812 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -497,7 +497,7 @@ namespace OpenSim | |||
497 | { | 497 | { |
498 | if (cmd.Length < 4) | 498 | if (cmd.Length < 4) |
499 | { | 499 | { |
500 | m_log.Error("Usage: create region <region name> <region_file.xml>"); | 500 | m_log.Error("Usage: create region <region name> <region_file.ini>"); |
501 | return; | 501 | return; |
502 | } | 502 | } |
503 | if (cmd[3].EndsWith(".xml")) | 503 | if (cmd[3].EndsWith(".xml")) |
@@ -524,7 +524,7 @@ namespace OpenSim | |||
524 | } | 524 | } |
525 | else | 525 | else |
526 | { | 526 | { |
527 | m_log.Error("Usage: create region <region name> <region_file.xml>"); | 527 | m_log.Error("Usage: create region <region name> <region_file.ini>"); |
528 | return; | 528 | return; |
529 | } | 529 | } |
530 | } | 530 | } |
@@ -557,7 +557,7 @@ namespace OpenSim | |||
557 | /// <param name="cmd"></param> | 557 | /// <param name="cmd"></param> |
558 | private void HandleLoginStatus(string module, string[] cmd) | 558 | private void HandleLoginStatus(string module, string[] cmd) |
559 | { | 559 | { |
560 | if (m_commsManager.GridService.RegionLoginsEnabled == false) | 560 | if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false) |
561 | 561 | ||
562 | m_log.Info("[ Login ] Login are disabled "); | 562 | m_log.Info("[ Login ] Login are disabled "); |
563 | else | 563 | else |
@@ -755,11 +755,6 @@ namespace OpenSim | |||
755 | } | 755 | } |
756 | break; | 756 | break; |
757 | 757 | ||
758 | case "link-region": | ||
759 | case "unlink-region": | ||
760 | case "link-mapping": | ||
761 | HGCommands.RunHGCommand(command, cmdparams, m_sceneManager.CurrentOrFirstScene); | ||
762 | break; | ||
763 | } | 758 | } |
764 | } | 759 | } |
765 | 760 | ||
@@ -1250,20 +1245,20 @@ namespace OpenSim | |||
1250 | protected void LoadOar(string module, string[] cmdparams) | 1245 | protected void LoadOar(string module, string[] cmdparams) |
1251 | { | 1246 | { |
1252 | try | 1247 | try |
1253 | { | 1248 | { |
1254 | if (cmdparams.Length > 2) | 1249 | if (cmdparams.Length > 2) |
1255 | { | 1250 | { |
1256 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); | 1251 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); |
1257 | } | 1252 | } |
1258 | else | 1253 | else |
1259 | { | 1254 | { |
1260 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); | 1255 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); |
1261 | } | 1256 | } |
1262 | } | 1257 | } |
1263 | catch (Exception e) | 1258 | catch (Exception e) |
1264 | { | 1259 | { |
1265 | m_log.Error(e.Message); | 1260 | m_log.Error(e.Message); |
1266 | } | 1261 | } |
1267 | } | 1262 | } |
1268 | 1263 | ||
1269 | /// <summary> | 1264 | /// <summary> |