diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Tools/pCampBot | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 13 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/PhysicsBot.cs | 14 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 7 |
3 files changed, 13 insertions, 21 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index a18fa1b..df06f47 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -27,12 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Reflection; |
31 | using System.IO; | 31 | using System.Threading; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using libsecondlife.Packets; | 33 | using log4net; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using System.Threading; | ||
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
38 | 37 | ||
@@ -43,13 +42,13 @@ namespace pCampBot | |||
43 | /// </summary> | 42 | /// </summary> |
44 | public class BotManager : conscmd_callback | 43 | public class BotManager : conscmd_callback |
45 | { | 44 | { |
46 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 46 | ||
48 | protected ConsoleBase m_console; | 47 | protected ConsoleBase m_console; |
49 | protected List<PhysicsBot> m_lBot; | 48 | protected List<PhysicsBot> m_lBot; |
50 | protected Thread[] m_td; | 49 | protected Thread[] m_td; |
51 | protected bool m_verbose = true; | 50 | protected bool m_verbose = true; |
52 | protected Random somthing = new Random(System.Environment.TickCount); | 51 | protected Random somthing = new Random(Environment.TickCount); |
53 | protected int numbots = 0; | 52 | protected int numbots = 0; |
54 | protected IConfig Previous_config; | 53 | protected IConfig Previous_config; |
55 | 54 | ||
@@ -117,7 +116,7 @@ namespace pCampBot | |||
117 | m_td[pos].IsBackground = true; | 116 | m_td[pos].IsBackground = true; |
118 | m_td[pos].Start(); | 117 | m_td[pos].Start(); |
119 | m_lBot.Add(pb); | 118 | m_lBot.Add(pb); |
120 | OpenSim.Framework.ThreadTracker.Add(m_td[pos]); | 119 | ThreadTracker.Add(m_td[pos]); |
121 | } | 120 | } |
122 | 121 | ||
123 | /// <summary> | 122 | /// <summary> |
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs index 8495b09..334f699 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs | |||
@@ -26,16 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.IO; | 29 | using System.IO; |
31 | using System.Text; | 30 | using System.Threading; |
31 | using System.Timers; | ||
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using libsecondlife.Packets; | ||
34 | using Nini.Config; | 33 | using Nini.Config; |
35 | using System.Threading; | ||
36 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
38 | using Timer = System.Timers.Timer; | 36 | using Timer=System.Timers.Timer; |
39 | 37 | ||
40 | namespace pCampBot | 38 | namespace pCampBot |
41 | { | 39 | { |
@@ -54,7 +52,7 @@ namespace pCampBot | |||
54 | 52 | ||
55 | protected Timer m_action; // Action Timer | 53 | protected Timer m_action; // Action Timer |
56 | 54 | ||
57 | protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here | 55 | protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here |
58 | 56 | ||
59 | //New instance of a SecondLife client | 57 | //New instance of a SecondLife client |
60 | public SecondLife client = new SecondLife(); | 58 | public SecondLife client = new SecondLife(); |
@@ -74,7 +72,7 @@ namespace pCampBot | |||
74 | //We do our actions here. This is where one would | 72 | //We do our actions here. This is where one would |
75 | //add additional steps and/or things the bot should do | 73 | //add additional steps and/or things the bot should do |
76 | 74 | ||
77 | void m_action_Elapsed(object sender, System.Timers.ElapsedEventArgs e) | 75 | void m_action_Elapsed(object sender, ElapsedEventArgs e) |
78 | { | 76 | { |
79 | //client.Throttle.Task = 500000f; | 77 | //client.Throttle.Task = 500000f; |
80 | //client.Throttle.Set(); | 78 | //client.Throttle.Set(); |
@@ -145,7 +143,7 @@ namespace pCampBot | |||
145 | if (OnConnected != null) | 143 | if (OnConnected != null) |
146 | { | 144 | { |
147 | m_action = new Timer(somthing.Next(1000, 10000)); | 145 | m_action = new Timer(somthing.Next(1000, 10000)); |
148 | m_action.Elapsed += new System.Timers.ElapsedEventHandler(m_action_Elapsed); | 146 | m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed); |
149 | m_action.Start(); | 147 | m_action.Start(); |
150 | OnConnected(this, EventType.CONNECTED); | 148 | OnConnected(this, EventType.CONNECTED); |
151 | client.Self.Jump(); | 149 | client.Self.Jump(); |
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index 6daccc4..d944608 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs | |||
@@ -26,12 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | using libsecondlife.Packets; | ||
33 | using Nini.Config; | 29 | using Nini.Config; |
34 | using System.Threading; | ||
35 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
36 | 31 | ||
37 | namespace pCampBot | 32 | namespace pCampBot |
@@ -86,7 +81,7 @@ namespace pCampBot | |||
86 | 81 | ||
87 | private static void Help() | 82 | private static void Help() |
88 | { | 83 | { |
89 | System.Console.WriteLine( | 84 | Console.WriteLine( |
90 | "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + | 85 | "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + |
91 | "Spawns a set of bots to test an OpenSim region\n\n" + | 86 | "Spawns a set of bots to test an OpenSim region\n\n" + |
92 | " -l, -loginuri loginuri for sim to log into (required)\n" + | 87 | " -l, -loginuri loginuri for sim to log into (required)\n" + |