aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-05 21:20:57 +0000
committerMelanie Thielker2009-03-05 21:20:57 +0000
commit3ad2fef2d3bf155a6cae6889d1d0c6427f5e5298 (patch)
tree92bbefff2d1c2ab1868e59d5b2a8f8546303cf65 /OpenSim
parent* Replace Scene.GetLandHeight() with a straight query to Scene.Heightmap (whi... (diff)
downloadopensim-SC_OLD-3ad2fef2d3bf155a6cae6889d1d0c6427f5e5298.zip
opensim-SC_OLD-3ad2fef2d3bf155a6cae6889d1d0c6427f5e5298.tar.gz
opensim-SC_OLD-3ad2fef2d3bf155a6cae6889d1d0c6427f5e5298.tar.bz2
opensim-SC_OLD-3ad2fef2d3bf155a6cae6889d1d0c6427f5e5298.tar.xz
Prevent ICommander-generated subcommand trees from generating an exception
when the tree root command is executes without another verb following it. Fixes Mantis #3258
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 588a39a..fda2037 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -358,7 +358,12 @@ namespace OpenSim.Framework.Console
358 if (ci.fn.Count == 0) 358 if (ci.fn.Count == 0)
359 return new string[0]; 359 return new string[0];
360 foreach (CommandDelegate fn in ci.fn) 360 foreach (CommandDelegate fn in ci.fn)
361 fn(ci.module, result); 361 {
362 if (fn != null)
363 fn(ci.module, result);
364 else
365 return new string[0];
366 }
362 return result; 367 return result;
363 } 368 }
364 369