Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
cd12ecd44e
|
@ -1676,10 +1676,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
|||
public void ModifyCommand(string module, string[] cmd)
|
||||
{
|
||||
string result;
|
||||
if (cmd.Length > 2)
|
||||
Scene scene = SceneManager.Instance.CurrentScene;
|
||||
if ((scene != null) && (scene != m_scene))
|
||||
{
|
||||
result = String.Empty;
|
||||
}
|
||||
else if (cmd.Length > 2)
|
||||
{
|
||||
string operationType = cmd[2];
|
||||
|
||||
|
||||
ITerrainModifier operation;
|
||||
if (!m_modifyOperations.TryGetValue(operationType, out operation))
|
||||
{
|
||||
|
@ -1704,7 +1710,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
|||
{
|
||||
result = "Usage: <operation-name> <arg1> <arg2>...";
|
||||
}
|
||||
MainConsole.Instance.Output(result);
|
||||
if (result != String.Empty)
|
||||
{
|
||||
MainConsole.Instance.Output(result);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
Loading…
Reference in New Issue