OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

fsassets
Diva Canto 2015-05-10 08:48:04 -07:00
parent 321601482b f20728fc86
commit cd12ecd44e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -1676,10 +1676,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain
public void ModifyCommand(string module, string[] cmd) public void ModifyCommand(string module, string[] cmd)
{ {
string result; 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]; string operationType = cmd[2];
ITerrainModifier operation; ITerrainModifier operation;
if (!m_modifyOperations.TryGetValue(operationType, out operation)) if (!m_modifyOperations.TryGetValue(operationType, out operation))
{ {
@ -1704,8 +1710,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{ {
result = "Usage: <operation-name> <arg1> <arg2>..."; result = "Usage: <operation-name> <arg1> <arg2>...";
} }
if (result != String.Empty)
{
MainConsole.Instance.Output(result); MainConsole.Instance.Output(result);
} }
}
#endregion #endregion