diff --git a/OpenSim/Framework/Console/ConsoleTable.cs b/OpenSim/Framework/Console/ConsoleTable.cs
new file mode 100644
index 0000000000..be3025be7f
--- /dev/null
+++ b/OpenSim/Framework/Console/ConsoleTable.cs
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenSim.Framework.Console
+{
+ ///
+ /// Used to generated a formatted table for the console.
+ ///
+ ///
+ /// Currently subject to change. If you use this, be prepared to change your code when this class changes.
+ ///
+ public class ConsoleTable
+ {
+ ///
+ /// Default number of spaces between table columns.
+ ///
+ public const int DefaultTableSpacing = 2;
+
+ ///
+ /// Table columns.
+ ///
+ public List Columns { get; private set; }
+
+ ///
+ /// Table rows
+ ///
+ public List Rows { get; private set; }
+
+ ///
+ /// Number of spaces to indent the table.
+ ///
+ public int Indent { get; set; }
+
+ ///
+ /// Spacing between table columns
+ ///
+ public int TableSpacing { get; set; }
+
+ public ConsoleTable()
+ {
+ TableSpacing = DefaultTableSpacing;
+ Columns = new List();
+ Rows = new List();
+ }
+
+ public override string ToString()
+ {
+ StringBuilder sb = new StringBuilder();
+ AddToStringBuilder(sb);
+ return sb.ToString();
+ }
+
+ public void AddToStringBuilder(StringBuilder sb)
+ {
+ string formatString = GetFormatString();
+// System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
+
+ // columns
+ sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
+
+ // rows
+ foreach (ConsoleTableRow row in Rows)
+ sb.AppendFormat(formatString, row.Cells.ToArray());
+ }
+
+ ///
+ /// Gets the format string for the table.
+ ///
+ private string GetFormatString()
+ {
+ StringBuilder formatSb = new StringBuilder();
+
+ formatSb.Append(' ', Indent);
+
+ for (int i = 0; i < Columns.Count; i++)
+ {
+ formatSb.Append(' ', TableSpacing);
+
+ // Can only do left formatting for now
+ formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
+ }
+
+ formatSb.Append('\n');
+
+ return formatSb.ToString();
+ }
+ }
+
+ public struct ConsoleTableColumn
+ {
+ public string Header { get; set; }
+ public int Width { get; set; }
+
+ public ConsoleTableColumn(string header, int width) : this()
+ {
+ Header = header;
+ Width = width;
+ }
+ }
+
+ public struct ConsoleTableRow
+ {
+ public List Cells { get; private set; }
+
+ public ConsoleTableRow(List cells) : this()
+ {
+ Cells = cells;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index e2bd7697fa..5b03ac7cbd 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -724,6 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
}
if (shouldTaint)
{
+ m_scene.EventManager.TriggerTerrainTainted();
m_tainted = true;
}
}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index e88a623d44..7688cf8982 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -53,6 +53,10 @@ namespace OpenSim.Region.Framework.Scenes
public event ClientMovement OnClientMovement;
+ public delegate void OnTerrainTaintedDelegate();
+
+ public event OnTerrainTaintedDelegate OnTerrainTainted;
+
public delegate void OnTerrainTickDelegate();
public delegate void OnTerrainUpdateDelegate();
@@ -938,6 +942,27 @@ namespace OpenSim.Region.Framework.Scenes
}
}
+ public void TriggerTerrainTainted()
+ {
+ OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted;
+ if (handlerTerrainTainted != null)
+ {
+ foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList())
+ {
+ try
+ {
+ d();
+ }
+ catch (Exception e)
+ {
+ m_log.ErrorFormat(
+ "[EVENT MANAGER]: Delegate for TriggerTerrainTainted failed - continuing. {0} {1}",
+ e.Message, e.StackTrace);
+ }
+ }
+ }
+ }
+
public void TriggerParcelPrimCountAdd(SceneObjectGroup obj)
{
OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = OnParcelPrimCountAdd;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ff2c46f17c..89cde057b7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1403,6 +1403,14 @@ namespace OpenSim.Region.Framework.Scenes
try
{
+ // Apply taints in terrain module to terrain in physics scene
+ if (Frame % m_update_terrain == 0)
+ {
+ terMS = Util.EnvironmentTickCount();
+ UpdateTerrain();
+ terrainMS = Util.EnvironmentTickCountSubtract(terMS);
+ }
+
tmpPhysicsMS2 = Util.EnvironmentTickCount();
if ((Frame % m_update_physics == 0) && m_physics_enabled)
m_sceneGraph.UpdatePreparePhysics();
@@ -1467,13 +1475,6 @@ namespace OpenSim.Region.Framework.Scenes
backupMS = Util.EnvironmentTickCountSubtract(backMS);
}
- if (Frame % m_update_terrain == 0)
- {
- terMS = Util.EnvironmentTickCount();
- UpdateTerrain();
- terrainMS = Util.EnvironmentTickCountSubtract(terMS);
- }
-
//if (Frame % m_update_land == 0)
//{
// int ldMS = Util.EnvironmentTickCount();
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
new file mode 100644
index 0000000000..a95514c642
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Statistics;
+using OpenSim.Region.ClientStack.LindenUDP;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.Avatar.Attachments
+{
+ ///
+ /// A module that just holds commands for inspecting avatar appearance.
+ ///
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsCommandModule")]
+ public class AttachmentsCommandModule : ISharedRegionModule
+ {
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private List m_scenes = new List();
+// private IAvatarFactoryModule m_avatarFactory;
+
+ public string Name { get { return "Attachments Command Module"; } }
+
+ public Type ReplaceableInterface { get { return null; } }
+
+ public void Initialise(IConfigSource source)
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: INITIALIZED MODULE");
+ }
+
+ public void PostInitialise()
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: POST INITIALIZED MODULE");
+ }
+
+ public void Close()
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: CLOSED MODULE");
+ }
+
+ public void AddRegion(Scene scene)
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+
+ lock (m_scenes)
+ m_scenes.Remove(scene);
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+// m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+
+ lock (m_scenes)
+ m_scenes.Add(scene);
+
+ scene.AddCommand(
+ "Users", this, "attachments show",
+ "attachments show [ ]",
+ "Show attachment information for avatars in this simulator.",
+ HandleShowAttachmentsCommand);
+ }
+
+ protected void HandleShowAttachmentsCommand(string module, string[] cmd)
+ {
+ if (cmd.Length != 2 && cmd.Length < 4)
+ {
+ MainConsole.Instance.OutputFormat("Usage: attachments show [ ]");
+ return;
+ }
+
+ bool targetNameSupplied = false;
+ string optionalTargetFirstName = null;
+ string optionalTargetLastName = null;
+
+ if (cmd.Length >= 4)
+ {
+ targetNameSupplied = true;
+ optionalTargetFirstName = cmd[2];
+ optionalTargetLastName = cmd[3];
+ }
+
+ StringBuilder sb = new StringBuilder();
+
+ lock (m_scenes)
+ {
+ foreach (Scene scene in m_scenes)
+ {
+ if (targetNameSupplied)
+ {
+ ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
+ if (sp != null && !sp.IsChildAgent)
+ GetAttachmentsReport(sp, sb);
+ }
+ else
+ {
+ scene.ForEachRootScenePresence(sp => GetAttachmentsReport(sp, sb));
+ }
+ }
+ }
+
+ MainConsole.Instance.Output(sb.ToString());
+ }
+
+ private void GetAttachmentsReport(ScenePresence sp, StringBuilder sb)
+ {
+ sb.AppendFormat("Attachments for {0}\n", sp.Name);
+
+ ConsoleTable ct = new ConsoleTable() { Indent = 2 };
+ ct.Columns.Add(new ConsoleTableColumn("Attachment Name", 36));
+ ct.Columns.Add(new ConsoleTableColumn("Local ID", 10));
+ ct.Columns.Add(new ConsoleTableColumn("Item ID", 36));
+ ct.Columns.Add(new ConsoleTableColumn("Attach Point", 14));
+ ct.Columns.Add(new ConsoleTableColumn("Position", 15));
+
+// sb.AppendFormat(
+// " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n",
+// "Attachment Name", "Local ID", "Item ID", "Attach Point", "Position");
+
+ List attachmentObjects = sp.GetAttachments();
+ foreach (SceneObjectGroup attachmentObject in attachmentObjects)
+ {
+// InventoryItemBase attachmentItem
+// = m_scenes[0].InventoryService.GetItem(new InventoryItemBase(attachmentObject.FromItemID));
+
+// if (attachmentItem == null)
+// {
+// sb.AppendFormat(
+// "WARNING: Couldn't find attachment for item {0} at point {1}\n",
+// attachmentData.ItemID, (AttachmentPoint)attachmentData.AttachPoint);
+// continue;
+// }
+// else
+// {
+// sb.AppendFormat(
+// " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n",
+// attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID,
+// (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos);
+ ct.Rows.Add(
+ new ConsoleTableRow(
+ new List()
+ {
+ attachmentObject.Name,
+ attachmentObject.LocalId.ToString(),
+ attachmentObject.FromItemID.ToString(),
+ ((AttachmentPoint)attachmentObject.AttachmentPoint).ToString(),
+ attachmentObject.RootPart.AttachedPos.ToString()
+ }));
+// }
+ }
+
+ ct.AddToStringBuilder(sb);
+ sb.Append("\n");
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index dc24418145..78f94347bd 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common
private AgentCircuitManager m_acm = new AgentCircuitManager();
private ISimulationDataService m_simDataService
= OpenSim.Server.Base.ServerUtils.LoadPlugin("OpenSim.Tests.Common.dll", null);
- private IEstateDataService m_estateDataService;
+ private IEstateDataService m_estateDataService = null;
private LocalAssetServicesConnector m_assetService;
private LocalAuthenticationServicesConnector m_authenticationService;
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index da090dda64..b6cd287202 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -43,6 +43,14 @@ using Timer = System.Timers.Timer;
namespace pCampBot
{
+ public enum ConnectionState
+ {
+ Disconnected,
+ Connecting,
+ Connected,
+ Disconnecting
+ }
+
public class Bot
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -86,7 +94,7 @@ namespace pCampBot
///
/// Is this bot connected to the grid?
///
- public bool IsConnected { get; private set; }
+ public ConnectionState ConnectionState { get; private set; }
public string FirstName { get; private set; }
public string LastName { get; private set; }
@@ -130,6 +138,8 @@ namespace pCampBot
BotManager bm, List behaviours,
string firstName, string lastName, string password, string loginUri)
{
+ ConnectionState = ConnectionState.Disconnected;
+
behaviours.ForEach(b => b.Initialize(this));
Client = new GridClient();
@@ -157,10 +167,10 @@ namespace pCampBot
Behaviours.ForEach(
b =>
{
+ Thread.Sleep(Random.Next(3000, 10000));
+
// m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
b.Action();
-
- Thread.Sleep(Random.Next(1000, 10000));
}
);
}
@@ -178,6 +188,8 @@ namespace pCampBot
///
public void shutdown()
{
+ ConnectionState = ConnectionState.Disconnecting;
+
if (m_actionThread != null)
m_actionThread.Abort();
@@ -209,9 +221,11 @@ namespace pCampBot
Client.Network.Disconnected += this.Network_OnDisconnected;
Client.Objects.ObjectUpdate += Objects_NewPrim;
+ ConnectionState = ConnectionState.Connecting;
+
if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
{
- IsConnected = true;
+ ConnectionState = ConnectionState.Connected;
Thread.Sleep(Random.Next(1000, 10000));
m_actionThread = new Thread(Action);
@@ -241,6 +255,8 @@ namespace pCampBot
}
else
{
+ ConnectionState = ConnectionState.Disconnected;
+
m_log.ErrorFormat(
"{0} {1} cannot login: {2}", FirstName, LastName, Client.Network.LoginMessage);
@@ -439,6 +455,8 @@ namespace pCampBot
public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
{
+ ConnectionState = ConnectionState.Disconnected;
+
m_log.DebugFormat(
"[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
@@ -456,7 +474,6 @@ namespace pCampBot
&& OnDisconnected != null)
// if (OnDisconnected != null)
{
- IsConnected = false;
OnDisconnected(this, EventType.DISCONNECTED);
}
}
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0f501b788b..d615b3fb8a 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -49,6 +49,14 @@ namespace pCampBot
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ public const int DefaultLoginDelay = 5000;
+
+ ///
+ /// Delay between logins of multiple bots.
+ ///
+ /// TODO: This value needs to be configurable by a command line argument.
+ public int LoginDelay { get; set; }
+
///
/// Command console
///
@@ -84,6 +92,8 @@ namespace pCampBot
///
public BotManager()
{
+ LoginDelay = DefaultLoginDelay;
+
Rng = new Random(Environment.TickCount);
AssetsReceived = new Dictionary();
RegionsKnown = new Dictionary();
@@ -151,28 +161,34 @@ namespace pCampBot
Array.ForEach(
cs.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
+ MainConsole.Instance.OutputFormat(
+ "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_",
+ botcount,
+ loginUri,
+ firstName,
+ lastNameStem);
+
+ MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
+
for (int i = 0; i < botcount; i++)
{
string lastName = string.Format("{0}_{1}", lastNameStem, i);
+ // We must give each bot its own list of instantiated behaviours since they store state.
List behaviours = new List();
-
+
// Hard-coded for now
if (behaviourSwitches.Contains("p"))
behaviours.Add(new PhysicsBehaviour());
-
+
if (behaviourSwitches.Contains("g"))
behaviours.Add(new GrabbingBehaviour());
-
+
if (behaviourSwitches.Contains("t"))
behaviours.Add(new TeleportBehaviour());
-
+
if (behaviourSwitches.Contains("c"))
behaviours.Add(new CrossBehaviour());
-
- MainConsole.Instance.OutputFormat(
- "[BOT MANAGER]: Bot {0} {1} configured for behaviours {2}",
- firstName, lastName, string.Join(",", behaviours.ConvertAll(b => b.Name).ToArray()));
StartBot(this, behaviours, firstName, lastName, password, loginUri);
}
@@ -211,6 +227,10 @@ namespace pCampBot
BotManager bm, List behaviours,
string firstName, string lastName, string password, string loginUri)
{
+ MainConsole.Instance.OutputFormat(
+ "[BOT MANAGER]: Starting bot {0} {1}, behaviours are {2}",
+ firstName, lastName, string.Join(",", behaviours.ConvertAll(b => b.Name).ToArray()));
+
Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
pb.OnConnected += handlebotEvent;
@@ -222,7 +242,11 @@ namespace pCampBot
Thread pbThread = new Thread(pb.startup);
pbThread.Name = pb.Name;
pbThread.IsBackground = true;
+
pbThread.Start();
+
+ // Stagger logins
+ Thread.Sleep(LoginDelay);
}
///
@@ -242,7 +266,7 @@ namespace pCampBot
lock (m_lBot)
{
- if (m_lBot.TrueForAll(b => !b.IsConnected))
+ if (m_lBot.TrueForAll(b => b.ConnectionState == ConnectionState.Disconnected))
Environment.Exit(0);
break;
@@ -251,13 +275,21 @@ namespace pCampBot
}
///
- /// Shutting down all bots
+ /// Shut down all bots
///
+ ///
+ /// We launch each shutdown on its own thread so that a slow shutting down bot doesn't hold up all the others.
+ ///
public void doBotShutdown()
{
lock (m_lBot)
- foreach (Bot pb in m_lBot)
- pb.shutdown();
+ {
+ foreach (Bot bot in m_lBot)
+ {
+ Bot thisBot = bot;
+ Util.FireAndForget(o => thisBot.shutdown());
+ }
+ }
}
///
@@ -271,11 +303,8 @@ namespace pCampBot
private void HandleShutdown(string module, string[] cmd)
{
- Util.FireAndForget(o =>
- {
- m_log.Warn("[BOTMANAGER]: Shutting down bots");
- doBotShutdown();
- });
+ m_log.Info("[BOTMANAGER]: Shutting down bots");
+ doBotShutdown();
}
private void HandleShowRegions(string module, string[] cmd)
@@ -302,9 +331,11 @@ namespace pCampBot
{
foreach (Bot pb in m_lBot)
{
+ Simulator currentSim = pb.Client.Network.CurrentSim;
+
MainConsole.Instance.OutputFormat(
outputFormat,
- pb.Name, pb.Client.Network.CurrentSim.Name, pb.IsConnected ? "Connected" : "Disconnected");
+ pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
}
}
}
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index ec5ad04fce..52e750185a 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -27,6 +27,7 @@
using System;
using System.Reflection;
+using System.Threading;
using log4net;
using Nini.Config;
using OpenSim.Framework;
@@ -67,7 +68,9 @@ namespace pCampBot
BotManager bm = new BotManager();
//startup specified number of bots. 1 is the default
- bm.dobotStartup(botcount, config);
+ Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, config));
+ startBotThread.Name = "Initial start bots thread";
+ startBotThread.Start();
while (true)
{