diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Tools/pCampBot/pCampBot.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Tools/pCampBot/pCampBot.cs')
| -rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index 1fb0e03..f162f10 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs | |||
| @@ -64,8 +64,8 @@ namespace pCampBot | |||
| 64 | Help(); | 64 | Help(); |
| 65 | } | 65 | } |
| 66 | else if ( | 66 | else if ( |
| 67 | commandLineConfig.Get("firstname") == null | 67 | commandLineConfig.Get("firstname") == null |
| 68 | || commandLineConfig.Get("lastname") == null | 68 | || commandLineConfig.Get("lastname") == null |
| 69 | || commandLineConfig.Get("password") == null) | 69 | || commandLineConfig.Get("password") == null) |
| 70 | { | 70 | { |
| 71 | Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots."); | 71 | Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots."); |
| @@ -93,7 +93,7 @@ namespace pCampBot | |||
| 93 | 93 | ||
| 94 | if (botConfig != null) | 94 | if (botConfig != null) |
| 95 | { | 95 | { |
| 96 | bm.InitBotSendAgentUpdates | 96 | bm.InitBotSendAgentUpdates |
| 97 | = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates); | 97 | = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates); |
| 98 | bm.InitBotRequestObjectTextures | 98 | bm.InitBotRequestObjectTextures |
| 99 | = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures); | 99 | = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures); |