aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-10 14:39:04 +0000
committerMelanie Thielker2009-02-10 14:39:04 +0000
commit87f328bd30bf327774becca51610588462c0953a (patch)
treeea42d50671f3761d98f9570ce02e06537283c169 /OpenSim/Framework
parentdropping obsolete XIRC section from OpenSim.ini.example (diff)
downloadopensim-SC-87f328bd30bf327774becca51610588462c0953a.zip
opensim-SC-87f328bd30bf327774becca51610588462c0953a.tar.gz
opensim-SC-87f328bd30bf327774becca51610588462c0953a.tar.bz2
opensim-SC-87f328bd30bf327774becca51610588462c0953a.tar.xz
Change the command parser and resolver to be able to disambiguate commands
that are a prefix of another command. Fixes "terrain load" Fixes Mantis #3123
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index e98944c..8e61587 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -238,6 +238,12 @@ namespace OpenSim.Framework.Console
238 238
239 foreach (string opt in current.Keys) 239 foreach (string opt in current.Keys)
240 { 240 {
241 if (remaining > 0 && opt == s)
242 {
243 found.Clear();
244 found.Add(opt);
245 break;
246 }
241 if (opt.StartsWith(s)) 247 if (opt.StartsWith(s))
242 { 248 {
243 found.Add(opt); 249 found.Add(opt);
@@ -301,6 +307,12 @@ namespace OpenSim.Framework.Console
301 307
302 foreach (string opt in current.Keys) 308 foreach (string opt in current.Keys)
303 { 309 {
310 if (opt == s)
311 {
312 found.Clear();
313 found.Add(opt);
314 break;
315 }
304 if (opt.StartsWith(s)) 316 if (opt.StartsWith(s))
305 { 317 {
306 found.Add(opt); 318 found.Add(opt);