diff options
author | BlueWall | 2012-03-02 15:02:09 -0500 |
---|---|---|
committer | BlueWall | 2012-03-02 15:02:09 -0500 |
commit | 6fc350725da5132eefe14897644d672ce586c5db (patch) | |
tree | d73af5d1d9bc61143fbac24a4dd54256a1394c97 /OpenSim/Tools | |
parent | Merge branch 'master' of /home/opensim/src/opensim into v3_support (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.zip opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.gz opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.bz2 opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.xz |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 7 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 0bd0bcc..da090dd 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
@@ -420,6 +420,8 @@ namespace pCampBot | |||
420 | 420 | ||
421 | public void Network_LoginProgress(object sender, LoginProgressEventArgs args) | 421 | public void Network_LoginProgress(object sender, LoginProgressEventArgs args) |
422 | { | 422 | { |
423 | m_log.DebugFormat("[BOT]: Bot {0} {1} in Network_LoginProcess", Name, args.Status); | ||
424 | |||
423 | if (args.Status == LoginStatus.Success) | 425 | if (args.Status == LoginStatus.Success) |
424 | { | 426 | { |
425 | if (OnConnected != null) | 427 | if (OnConnected != null) |
@@ -431,10 +433,15 @@ namespace pCampBot | |||
431 | 433 | ||
432 | public void Network_SimConnected(object sender, SimConnectedEventArgs args) | 434 | public void Network_SimConnected(object sender, SimConnectedEventArgs args) |
433 | { | 435 | { |
436 | m_log.DebugFormat( | ||
437 | "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint); | ||
434 | } | 438 | } |
435 | 439 | ||
436 | public void Network_OnDisconnected(object sender, DisconnectedEventArgs args) | 440 | public void Network_OnDisconnected(object sender, DisconnectedEventArgs args) |
437 | { | 441 | { |
442 | m_log.DebugFormat( | ||
443 | "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message); | ||
444 | |||
438 | // m_log.ErrorFormat("Fired Network_OnDisconnected"); | 445 | // m_log.ErrorFormat("Fired Network_OnDisconnected"); |
439 | 446 | ||
440 | // if ( | 447 | // if ( |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 6481e97..0f501b7 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -266,7 +266,7 @@ namespace pCampBot | |||
266 | /// <returns></returns> | 266 | /// <returns></returns> |
267 | protected CommandConsole CreateConsole() | 267 | protected CommandConsole CreateConsole() |
268 | { | 268 | { |
269 | return new LocalConsole("Region"); | 269 | return new LocalConsole("pCampbot"); |
270 | } | 270 | } |
271 | 271 | ||
272 | private void HandleShutdown(string module, string[] cmd) | 272 | private void HandleShutdown(string module, string[] cmd) |
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index a73fcbe..ec5ad04 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs | |||
@@ -56,6 +56,10 @@ namespace pCampBot | |||
56 | { | 56 | { |
57 | Help(); | 57 | Help(); |
58 | } | 58 | } |
59 | else if (config.Get("firstname") == null || config.Get("lastname") == null || config.Get("password") == null) | ||
60 | { | ||
61 | Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots."); | ||
62 | } | ||
59 | else | 63 | else |
60 | { | 64 | { |
61 | int botcount = config.GetInt("botcount", 1); | 65 | int botcount = config.GetInt("botcount", 1); |