diff options
| author | Diva Canto | 2012-03-15 20:22:59 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-15 20:22:59 -0700 |
| commit | 05bb2e42757078737944d2f3179b0b964ae460c8 (patch) | |
| tree | 188e53afb08a96f07996e7d4c0e2dd2db3518096 /OpenSim/Region/Application | |
| parent | More on map search: send extra messages to the user regarding the region bein... (diff) | |
| parent | Add process working memory to "show stats" memory statistics. (diff) | |
| download | opensim-SC-05bb2e42757078737944d2f3179b0b964ae460c8.zip opensim-SC-05bb2e42757078737944d2f3179b0b964ae460c8.tar.gz opensim-SC-05bb2e42757078737944d2f3179b0b964ae460c8.tar.bz2 opensim-SC-05bb2e42757078737944d2f3179b0b964ae460c8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 6fba249..e955a58 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -503,7 +503,11 @@ namespace OpenSim | |||
| 503 | string currentCommand; | 503 | string currentCommand; |
| 504 | while ((currentCommand = readFile.ReadLine()) != null) | 504 | while ((currentCommand = readFile.ReadLine()) != null) |
| 505 | { | 505 | { |
| 506 | if (currentCommand != String.Empty) | 506 | currentCommand = currentCommand.Trim(); |
| 507 | if (!(currentCommand == "" | ||
| 508 | || currentCommand.StartsWith(";") | ||
| 509 | || currentCommand.StartsWith("//") | ||
| 510 | || currentCommand.StartsWith("#"))) | ||
| 507 | { | 511 | { |
| 508 | m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'"); | 512 | m_log.Info("[COMMANDFILE]: Running '" + currentCommand + "'"); |
| 509 | m_console.RunCommand(currentCommand); | 513 | m_console.RunCommand(currentCommand); |