aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 08:23:38 +0100
committerMelanie2009-10-02 08:23:38 +0100
commit31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
treea2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Region/Application/OpenSim.cs
parentRestore the missing image handling to the image manager. The missing (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2
opensim-SC_OLD-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index b23cdc3..4d8409bb 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -493,7 +493,7 @@ namespace OpenSim
493 { 493 {
494 if (cmd.Length < 4) 494 if (cmd.Length < 4)
495 { 495 {
496 m_log.Error("Usage: create region <region name> <region_file.xml>"); 496 m_log.Error("Usage: create region <region name> <region_file.ini>");
497 return; 497 return;
498 } 498 }
499 if (cmd[3].EndsWith(".xml")) 499 if (cmd[3].EndsWith(".xml"))
@@ -520,7 +520,7 @@ namespace OpenSim
520 } 520 }
521 else 521 else
522 { 522 {
523 m_log.Error("Usage: create region <region name> <region_file.xml>"); 523 m_log.Error("Usage: create region <region name> <region_file.ini>");
524 return; 524 return;
525 } 525 }
526 } 526 }
@@ -553,7 +553,7 @@ namespace OpenSim
553 /// <param name="cmd"></param> 553 /// <param name="cmd"></param>
554 private void HandleLoginStatus(string module, string[] cmd) 554 private void HandleLoginStatus(string module, string[] cmd)
555 { 555 {
556 if (m_commsManager.GridService.RegionLoginsEnabled == false) 556 if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
557 557
558 m_log.Info("[ Login ] Login are disabled "); 558 m_log.Info("[ Login ] Login are disabled ");
559 else 559 else
@@ -1230,20 +1230,20 @@ namespace OpenSim
1230 protected void LoadOar(string module, string[] cmdparams) 1230 protected void LoadOar(string module, string[] cmdparams)
1231 { 1231 {
1232 try 1232 try
1233 { 1233 {
1234 if (cmdparams.Length > 2) 1234 if (cmdparams.Length > 2)
1235 { 1235 {
1236 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); 1236 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
1237 } 1237 }
1238 else 1238 else
1239 { 1239 {
1240 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); 1240 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
1241 } 1241 }
1242 } 1242 }
1243 catch (Exception e) 1243 catch (Exception e)
1244 { 1244 {
1245 m_log.Error(e.Message); 1245 m_log.Error(e.Message);
1246 } 1246 }
1247 } 1247 }
1248 1248
1249 /// <summary> 1249 /// <summary>