From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../Tools/pCampBot/Behaviours/AbstractBehaviour.cs | 4 +-- .../Tools/pCampBot/Behaviours/CrossBehaviour.cs | 6 ++-- .../Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 6 ++-- .../Behaviours/InventoryDownloadBehaviour.cs | 6 ++-- OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | 8 ++--- .../Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs | 6 ++-- .../Tools/pCampBot/Behaviours/TeleportBehaviour.cs | 4 +-- .../Tools/pCampBot/Behaviours/TwitchyBehaviour.cs | 8 ++--- OpenSim/Tools/pCampBot/Bot.cs | 24 +++++++-------- OpenSim/Tools/pCampBot/BotManager.cs | 34 +++++++++++----------- OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs | 2 +- OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs | 10 +++---- OpenSim/Tools/pCampBot/pCampBot.cs | 6 ++-- 13 files changed, 62 insertions(+), 62 deletions(-) (limited to 'OpenSim/Tools/pCampBot') diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs index c1ba36b..f46948c 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs @@ -37,7 +37,7 @@ namespace pCampBot public abstract class AbstractBehaviour : IBehaviour { /// - /// Abbreviated name of this behaviour. + /// Abbreviated name of this behaviour. /// public string AbbreviatedName { get; protected set; } @@ -56,7 +56,7 @@ namespace pCampBot Bot = bot; } - public virtual void Close() + public virtual void Close() { Interrupt(); } diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs index 4d806fc..451cfcc 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs @@ -47,10 +47,10 @@ namespace pCampBot public const int m_regionCrossingTimeout = 1000 * 60; - public CrossBehaviour() - { + public CrossBehaviour() + { AbbreviatedName = "c"; - Name = "Cross"; + Name = "Cross"; } public override void Action() diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs index 59f6244..b27ece8 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs @@ -42,10 +42,10 @@ namespace pCampBot /// public class GrabbingBehaviour : AbstractBehaviour { - public GrabbingBehaviour() - { + public GrabbingBehaviour() + { AbbreviatedName = "g"; - Name = "Grabbing"; + Name = "Grabbing"; } public override void Action() diff --git a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs index 521415c..e868fa9 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs @@ -45,8 +45,8 @@ namespace pCampBot private Stopwatch m_StopWatch = new Stopwatch(); private List m_processed = new List(); - public InventoryDownloadBehaviour() - { + public InventoryDownloadBehaviour() + { AbbreviatedName = "inv"; Name = "Inventory"; } @@ -113,7 +113,7 @@ namespace pCampBot } - public override void Interrupt() + public override void Interrupt() { m_interruptEvent.Set(); } diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs index 0d43781..b832d7e 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs @@ -38,10 +38,10 @@ namespace pCampBot /// public class NoneBehaviour : AbstractBehaviour { - public NoneBehaviour() - { + public NoneBehaviour() + { AbbreviatedName = "n"; - Name = "None"; + Name = "None"; } public override void Action() @@ -52,7 +52,7 @@ namespace pCampBot Bot.Client.Self.Movement.Stop = false; } - public override void Interrupt() + public override void Interrupt() { m_interruptEvent.Set(); } diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs index 1ec2046..54782c1 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs @@ -45,10 +45,10 @@ namespace pCampBot { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public PhysicsBehaviour2() - { + public PhysicsBehaviour2() + { AbbreviatedName = "ph2"; - Name = "Physics2"; + Name = "Physics2"; } private const int TIME_WALKING = 5 * 10; // 5 seconds diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs index 81f250d..9611d72 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs @@ -43,10 +43,10 @@ namespace pCampBot { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public TeleportBehaviour() + public TeleportBehaviour() { AbbreviatedName = "t"; - Name = "Teleport"; + Name = "Teleport"; } public override void Action() diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs index 7b4639d..42dbc8f 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs @@ -38,7 +38,7 @@ namespace pCampBot /// /// This behavior is for the systematic study of some performance improvements made /// for OSCC'13. - /// Do nothing, but send AgentUpdate packets all the time that have only slightly + /// Do nothing, but send AgentUpdate packets all the time that have only slightly /// different state. The delta of difference will be filtered by OpenSim early on /// in the packet processing pipeline. These filters did not exist before OSCC'13. /// @@ -46,10 +46,10 @@ namespace pCampBot { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public TwitchyBehaviour() - { + public TwitchyBehaviour() + { AbbreviatedName = "tw"; - Name = "Twitchy"; + Name = "Twitchy"; } private const float TWITCH = 0.0001f; diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 4f28733..a142527 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs @@ -57,10 +57,10 @@ namespace pCampBot { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public int PacketDebugLevel - { + public int PacketDebugLevel + { get { return m_packetDebugLevel; } - set + set { if (value == m_packetDebugLevel) return; @@ -217,7 +217,7 @@ namespace pCampBot Dictionary updatedBehaviours = new Dictionary(Behaviours); if (!updatedBehaviours.ContainsKey(behaviour.AbbreviatedName)) - { + { behaviour.Initialize(this); updatedBehaviours.Add(behaviour.AbbreviatedName, behaviour); Behaviours = updatedBehaviours; @@ -313,7 +313,7 @@ namespace pCampBot foreach (IBehaviour behaviour in Behaviours.Values) { // Thread.Sleep(Random.Next(3000, 10000)); - + // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType()); behaviour.Action(); } @@ -329,7 +329,7 @@ namespace pCampBot public void Disconnect() { ConnectionState = ConnectionState.Disconnecting; - + foreach (IBehaviour behaviour in Behaviours.Values) behaviour.Close(); @@ -337,7 +337,7 @@ namespace pCampBot } public void Connect() - { + { Thread connectThread = new Thread(ConnectInternal); connectThread.Name = Name; connectThread.IsBackground = true; @@ -508,7 +508,7 @@ namespace pCampBot InventoryFolder clothfolder = FindClothingFolder(); UUID transid = UUID.Random(); List listwearables = new List(); - + for (int i = 0; i < clothing.Length; i++) { UUID assetID = UUID.Random(); @@ -707,7 +707,7 @@ namespace pCampBot m_log.Warn(string.Format("Error requesting {0} {1}", texture ? "texture" : "mesh", assetID), e); } } - + public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture) { if (state == TextureRequestState.Finished) @@ -722,7 +722,7 @@ namespace pCampBot lock (Manager.AssetsReceived) Manager.AssetsReceived[assetMesh.AssetID] = success; } - + public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset) { lock (Manager.AssetsReceived) @@ -733,7 +733,7 @@ namespace pCampBot // SaveAsset((AssetWearable) asset); // } } - + private void PacketReceivedDebugHandler(object o, PacketReceivedEventArgs args) { Packet p = args.Packet; @@ -741,7 +741,7 @@ namespace pCampBot Simulator s = args.Simulator; m_log.DebugFormat( - "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}", + "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}", Name, s.Name, p.Type, h.Sequence, h.Reliable, h.Resent); } } diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 0af9592..37dc0d9 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -219,14 +219,14 @@ namespace pCampBot HandleDisconnect); m_console.Commands.AddCommand( - "Bots", false, "add behaviour", "add behaviour []", + "Bots", false, "add behaviour", "add behaviour []", "Add a behaviour to a bot", "If no bot number is specified then behaviour is added to all bots.\n" + "Can be performed on connected or disconnected bots.", HandleAddBehaviour); m_console.Commands.AddCommand( - "Bots", false, "remove behaviour", "remove behaviour []", + "Bots", false, "remove behaviour", "remove behaviour []", "Remove a behaviour from a bot", "If no bot number is specified then behaviour is added to all bots.\n" + "Can be performed on connected or disconnected bots.", @@ -250,14 +250,14 @@ namespace pCampBot "Bots", false, "show bots", "show bots", "Shows the status of all bots.", HandleShowBotsStatus); m_console.Commands.AddCommand( - "Bots", false, "show bot", "show bot ", + "Bots", false, "show bot", "show bot ", "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus); m_console.Commands.AddCommand( - "Debug", - false, - "debug lludp packet", - "debug lludp packet ", + "Debug", + false, + "debug lludp packet", + "debug lludp packet ", "Turn on received packet logging.", "If level > 0 then all received packets that are not duplicates are logged.\n" + "If level <= 0 then no received packets are logged.", @@ -317,7 +317,7 @@ namespace pCampBot // We must give each bot its own list of instantiated behaviours since they store state. List behaviours = new List(); - // Hard-coded for now + // Hard-coded for now foreach (string abName in abbreviatedNames) { IBehaviour newBehaviour = null; @@ -534,7 +534,7 @@ namespace pCampBot } private void HandleConnect(string module, string[] cmd) - { + { lock (m_bots) { int botsToConnect; @@ -607,7 +607,7 @@ namespace pCampBot } MainConsole.Instance.OutputFormat( - "Added behaviours {0} to bot {1}", + "Added behaviours {0} to bot {1}", string.Join(", ", behavioursAdded.ConvertAll(b => b.Name).ToArray()), bot.Name); } } @@ -665,7 +665,7 @@ namespace pCampBot } MainConsole.Instance.OutputFormat( - "Removed behaviours {0} from bot {1}", + "Removed behaviours {0} from bot {1}", string.Join(", ", behavioursRemoved.ConvertAll(b => b.Name).ToArray()), bot.Name); } } @@ -779,7 +779,7 @@ namespace pCampBot string rawValue = cmd[3]; if (key == "SEND_AGENT_UPDATES") - { + { bool newSendAgentUpdatesSetting; if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newSendAgentUpdatesSetting)) @@ -873,10 +873,10 @@ namespace pCampBot totals[bot.ConnectionState]++; cdt.AddRow( - bot.Name, - currentSim != null ? currentSim.Name : "(none)", - bot.ConnectionState, - bot.SimulatorsCount, + bot.Name, + currentSim != null ? currentSim.Name : "(none)", + bot.ConnectionState, + bot.SimulatorsCount, string.Join(",", bot.Behaviours.Keys.ToArray())); } } @@ -930,7 +930,7 @@ namespace pCampBot ConsoleDisplayList statusCdl = new ConsoleDisplayList(); statusCdl.AddRow( - "Behaviours", + "Behaviours", string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll(b => b.Name).ToArray())); GridClient botClient = bot.Client; diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs index 660c630..beb8413 100644 --- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs @@ -32,7 +32,7 @@ namespace pCampBot.Interfaces public interface IBehaviour { /// - /// Abbreviated name of this behaviour. + /// Abbreviated name of this behaviour. /// string AbbreviatedName { get; } diff --git a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs index f551135..8b96c92 100644 --- a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs +++ b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("pCampBot")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,9 +25,9 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -[assembly: AssemblyVersion("0.8.3.*")] +[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] 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 Help(); } else if ( - commandLineConfig.Get("firstname") == null - || commandLineConfig.Get("lastname") == null + commandLineConfig.Get("firstname") == null + || commandLineConfig.Get("lastname") == null || commandLineConfig.Get("password") == null) { Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots."); @@ -93,7 +93,7 @@ namespace pCampBot if (botConfig != null) { - bm.InitBotSendAgentUpdates + bm.InitBotSendAgentUpdates = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates); bm.InitBotRequestObjectTextures = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures); -- cgit v1.1