ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into diva-textures

Browse Source
This commit is contained in:
Melanie
2009-10-02 08:23:38 +01:00
parent 3ba36bb4d8 a2cdbd784d
commit 31d8cec0f8
356 changed files with 8423 additions and 5997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Application/OpenSim.cs
View File

@@ -493,7 +493,7 @@ namespace OpenSim
{
if (cmd.Length < 4)
{
m_log.Error("Usage: create region <region name> <region_file.xml>");
m_log.Error("Usage: create region <region name> <region_file.ini>");
return;
}
if (cmd[3].EndsWith(".xml"))
@@ -520,7 +520,7 @@ namespace OpenSim
}
else
{
m_log.Error("Usage: create region <region name> <region_file.xml>");
m_log.Error("Usage: create region <region name> <region_file.ini>");
return;
}
}
@@ -553,7 +553,7 @@ namespace OpenSim
/// <param name="cmd"></param>
private void HandleLoginStatus(string module, string[] cmd)
{
if (m_commsManager.GridService.RegionLoginsEnabled == false)
if (m_sceneManager.CurrentOrFirstScene.SceneGridService.RegionLoginsEnabled == false)
m_log.Info("[ Login ] Login are disabled ");
else
@@ -1230,20 +1230,20 @@ namespace OpenSim
protected void LoadOar(string module, string[] cmdparams)
{
try
{
{
if (cmdparams.Length > 2)
{
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
}
else
{
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
}
}
catch (Exception e)
{
m_log.Error(e.Message);
}
}
}
/// <summary>