diff options
author | Justin Clark-Casey (justincc) | 2011-11-24 17:35:33 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-24 17:35:33 +0000 |
commit | bdcfd6afee5651bd5fc3b4e6a2dfeeb47b983661 (patch) | |
tree | 6cc450364e5f4eb2c56019d144635e152028b5b8 /OpenSim/Tools | |
parent | Print out what behaviours are active when pCampBot starts up (diff) | |
download | opensim-SC-bdcfd6afee5651bd5fc3b4e6a2dfeeb47b983661.zip opensim-SC-bdcfd6afee5651bd5fc3b4e6a2dfeeb47b983661.tar.gz opensim-SC-bdcfd6afee5651bd5fc3b4e6a2dfeeb47b983661.tar.bz2 opensim-SC-bdcfd6afee5651bd5fc3b4e6a2dfeeb47b983661.tar.xz |
Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots between neighbouring regions.
Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 3 | ||||
-rw-r--r-- | OpenSim/Tools/pCampBot/pCampBot.cs | 26 |
4 files changed, 18 insertions, 14 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs index f782bb5..25529d0 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | |||
@@ -73,7 +73,6 @@ namespace pCampBot | |||
73 | Thread.Sleep(bot.Random.Next(3000, 13000)); | 73 | Thread.Sleep(bot.Random.Next(3000, 13000)); |
74 | bot.Client.Self.Movement.AtPos = false; | 74 | bot.Client.Self.Movement.AtPos = false; |
75 | bot.Client.Self.Jump(true); | 75 | bot.Client.Self.Jump(true); |
76 | |||
77 | string randomf = talkarray[bot.Random.Next(talkarray.Length)]; | 76 | string randomf = talkarray[bot.Random.Next(talkarray.Length)]; |
78 | if (talkarray.Length > 1 && randomf.Length > 1) | 77 | if (talkarray.Length > 1 && randomf.Length > 1) |
79 | bot.Client.Self.Chat(randomf, 0, ChatType.Normal); | 78 | bot.Client.Self.Chat(randomf, 0, ChatType.Normal); |
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 7a73e3f..409734e 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
@@ -226,8 +226,6 @@ namespace pCampBot | |||
226 | MakeDefaultAppearance(wear); | 226 | MakeDefaultAppearance(wear); |
227 | } | 227 | } |
228 | 228 | ||
229 | Client.Self.Jump(true); | ||
230 | |||
231 | // Extract nearby region information. | 229 | // Extract nearby region information. |
232 | Client.Grid.GridRegion += Manager.Grid_GridRegion; | 230 | Client.Grid.GridRegion += Manager.Grid_GridRegion; |
233 | uint xUint, yUint; | 231 | uint xUint, yUint; |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 29cb1ba..d91990f 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -163,6 +163,9 @@ namespace pCampBot | |||
163 | if (behaviourSwitches.Contains("t")) | 163 | if (behaviourSwitches.Contains("t")) |
164 | behaviours.Add(new TeleportBehaviour()); | 164 | behaviours.Add(new TeleportBehaviour()); |
165 | 165 | ||
166 | // if (behaviourSwitches.Contains("c")) | ||
167 | // behaviours.Add(new CrossBehaviour()); | ||
168 | |||
166 | MainConsole.Instance.OutputFormat( | 169 | MainConsole.Instance.OutputFormat( |
167 | "[BOT MANAGER]: Bots configured for behaviours {0}", | 170 | "[BOT MANAGER]: Bots configured for behaviours {0}", |
168 | string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray())); | 171 | string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray())); |
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs index e7288d5..3f43cff 100644 --- a/OpenSim/Tools/pCampBot/pCampBot.cs +++ b/OpenSim/Tools/pCampBot/pCampBot.cs | |||
@@ -104,17 +104,21 @@ namespace pCampBot | |||
104 | // name, to load an specific folder, or save, to save an avatar with some already existing wearables | 104 | // name, to load an specific folder, or save, to save an avatar with some already existing wearables |
105 | // worn to the folder MyAppearance/FirstName_LastName, and the load it. | 105 | // worn to the folder MyAppearance/FirstName_LastName, and the load it. |
106 | Console.WriteLine( | 106 | Console.WriteLine( |
107 | "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + | 107 | "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + |
108 | "Spawns a set of bots to test an OpenSim region\n\n" + | 108 | "Spawns a set of bots to test an OpenSim region\n\n" + |
109 | " -l, -loginuri loginuri for sim to log into (required)\n" + | 109 | " -l, -loginuri loginuri for sim to log into (required)\n" + |
110 | " -n, -botcount number of bots to start (default: 1)\n" + | 110 | " -n, -botcount number of bots to start (default: 1)\n" + |
111 | " -firstname first name for the bots\n" + | 111 | " -firstname first name for the bots\n" + |
112 | " -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" + | 112 | " -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" + |
113 | " -password password for the bots\n" + | 113 | " -password password for the bots\n" + |
114 | " -b, behaviours behaviours for bots. Current options p (physics), g (grab), t (teleport). Comma separated, e.g. p,g. Default is p", | 114 | " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p\n", |
115 | " -wear set appearance folder to load from (default: no)\n" + | 115 | " current options are:" + |
116 | " -h, -help show this message" | 116 | " p (physics)" + |
117 | ); | 117 | " g (grab)" + |
118 | " t (teleport)" + | ||
119 | // " c (cross)" + | ||
120 | " -wear set appearance folder to load from (default: no)\n" + | ||
121 | " -h, -help show this message"); | ||
118 | } | 122 | } |
119 | } | 123 | } |
120 | } | 124 | } |