aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-11 00:37:20 +0100
committerJustin Clark-Casey (justincc)2012-05-11 00:37:20 +0100
commitab4e6a02a52bfd473ea3c2050774103ec8eb3934 (patch)
treec8b12be126fc30daf958262ccb16ccb522d90ffd
parentAdd ConsoleTable framework class for future uniform formatting of console out... (diff)
downloadopensim-SC_OLD-ab4e6a02a52bfd473ea3c2050774103ec8eb3934.zip
opensim-SC_OLD-ab4e6a02a52bfd473ea3c2050774103ec8eb3934.tar.gz
opensim-SC_OLD-ab4e6a02a52bfd473ea3c2050774103ec8eb3934.tar.bz2
opensim-SC_OLD-ab4e6a02a52bfd473ea3c2050774103ec8eb3934.tar.xz
If a bot is not connected, show region name "(none)" instead of throwing an exception in the "show bots" command of pCampbot
Diffstat (limited to '')
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0f501b7..fd32a6a 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -302,9 +302,11 @@ namespace pCampBot
302 { 302 {
303 foreach (Bot pb in m_lBot) 303 foreach (Bot pb in m_lBot)
304 { 304 {
305 Simulator currentSim = pb.Client.Network.CurrentSim;
306
305 MainConsole.Instance.OutputFormat( 307 MainConsole.Instance.OutputFormat(
306 outputFormat, 308 outputFormat,
307 pb.Name, pb.Client.Network.CurrentSim.Name, pb.IsConnected ? "Connected" : "Disconnected"); 309 pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.IsConnected ? "Connected" : "Disconnected");
308 } 310 }
309 } 311 }
310 } 312 }