From d0ed6ed86ef7ee9854c742bcd994000707cf139d Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 15 Aug 2014 22:43:55 +0100 Subject: [PATCH] Don't allow the last behavior to be removed from a pCampbot bot If you want to stop existing behavious, add the None behaviour. --- OpenSim/Tools/pCampBot/Bot.cs | 3 +++ OpenSim/Tools/pCampBot/BotManager.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 37c30fd345..4fc098161d 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs @@ -208,6 +208,9 @@ namespace pCampBot public bool RemoveBehaviour(string abbreviatedName) { + if (Behaviours.Count <= 0) + return false; + Dictionary updatedBehaviours = new Dictionary(Behaviours); IBehaviour behaviour; diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 48f6f4221a..c6392b2402 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -604,7 +604,7 @@ namespace pCampBot } MainConsole.Instance.OutputFormat( - "Removed behaviours {0} to bot {1}", + "Removed behaviours {0} from bot {1}", string.Join(", ", behavioursRemoved.ConvertAll(b => b.Name).ToArray()), bot.Name); } }