aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2015-03-14 14:24:55 -0700
committerdahlia2015-03-14 14:24:55 -0700
commit8b13e4e7315fd2736eff7963ef2d786f5913a450 (patch)
tree5c41cd62d326dd847c699617c19173fd2b834868
parentminor: fix compiler warnings in EstateDataRobustConnector (diff)
downloadopensim-SC-8b13e4e7315fd2736eff7963ef2d786f5913a450.zip
opensim-SC-8b13e4e7315fd2736eff7963ef2d786f5913a450.tar.gz
opensim-SC-8b13e4e7315fd2736eff7963ef2d786f5913a450.tar.bz2
opensim-SC-8b13e4e7315fd2736eff7963ef2d786f5913a450.tar.xz
Revert "Allow a console command to give blank arguments ("") without the parser failing, e.g. login text """
This reverts commit 129cc49eb4d2f43cdda3804447f84bd3df397ff1. It was causing the "alert" console command to fail.
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 23a2cc8..0f68afe 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -433,10 +433,6 @@ namespace OpenSim.Framework.Console
433 433
434 foreach (string s in cmd) 434 foreach (string s in cmd)
435 { 435 {
436 // If a user puts an empty string on the console then this cannot be part of the command.
437 if (s == "")
438 break;
439
440 index++; 436 index++;
441 437
442 List<string> found = new List<string>(); 438 List<string> found = new List<string>();
@@ -447,8 +443,9 @@ namespace OpenSim.Framework.Console
447 { 443 {
448 found.Clear(); 444 found.Clear();
449 found.Add(opt); 445 found.Add(opt);
446 break;
450 } 447 }
451 else if (opt.StartsWith(s)) 448 if (opt.StartsWith(s))
452 { 449 {
453 found.Add(opt); 450 found.Add(opt);
454 } 451 }