OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
iar_mods
Justin Clark-Casey (justincc) 2011-11-24 17:35:33 +00:00
parent ed7ddeecf2
commit bdcfd6afee
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
return; return;
} }
m_log.DebugFormat("MAP NAME=({0})", mapName); //m_log.DebugFormat("MAP NAME=({0})", mapName);
// try to fetch from GridServer // try to fetch from GridServer
List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);

1
OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
View File

@ -73,7 +73,6 @@ namespace pCampBot
Thread.Sleep(bot.Random.Next(3000, 13000)); Thread.Sleep(bot.Random.Next(3000, 13000));
bot.Client.Self.Movement.AtPos = false; bot.Client.Self.Movement.AtPos = false;
bot.Client.Self.Jump(true); bot.Client.Self.Jump(true);
string randomf = talkarray[bot.Random.Next(talkarray.Length)]; string randomf = talkarray[bot.Random.Next(talkarray.Length)];
if (talkarray.Length > 1 && randomf.Length > 1) if (talkarray.Length > 1 && randomf.Length > 1)
bot.Client.Self.Chat(randomf, 0, ChatType.Normal); bot.Client.Self.Chat(randomf, 0, ChatType.Normal);

2
OpenSim/Tools/pCampBot/Bot.cs
View File

@ -226,8 +226,6 @@ namespace pCampBot
MakeDefaultAppearance(wear); MakeDefaultAppearance(wear);
} }
Client.Self.Jump(true);
// Extract nearby region information. // Extract nearby region information.
Client.Grid.GridRegion += Manager.Grid_GridRegion; Client.Grid.GridRegion += Manager.Grid_GridRegion;
uint xUint, yUint; uint xUint, yUint;

3
OpenSim/Tools/pCampBot/BotManager.cs
View File

@ -163,6 +163,9 @@ namespace pCampBot
if (behaviourSwitches.Contains("t")) if (behaviourSwitches.Contains("t"))
behaviours.Add(new TeleportBehaviour()); behaviours.Add(new TeleportBehaviour());
// if (behaviourSwitches.Contains("c"))
// behaviours.Add(new CrossBehaviour());
MainConsole.Instance.OutputFormat( MainConsole.Instance.OutputFormat(
"[BOT MANAGER]: Bots configured for behaviours {0}", "[BOT MANAGER]: Bots configured for behaviours {0}",
string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray())); string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));

26
OpenSim/Tools/pCampBot/pCampBot.cs
View File

@ -104,17 +104,21 @@ namespace pCampBot
// name, to load an specific folder, or save, to save an avatar with some already existing wearables // name, to load an specific folder, or save, to save an avatar with some already existing wearables
// worn to the folder MyAppearance/FirstName_LastName, and the load it. // worn to the folder MyAppearance/FirstName_LastName, and the load it.
Console.WriteLine( Console.WriteLine(
"usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" + "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
"Spawns a set of bots to test an OpenSim region\n\n" + "Spawns a set of bots to test an OpenSim region\n\n" +
" -l, -loginuri loginuri for sim to log into (required)\n" + " -l, -loginuri loginuri for sim to log into (required)\n" +
" -n, -botcount number of bots to start (default: 1)\n" + " -n, -botcount number of bots to start (default: 1)\n" +
" -firstname first name for the bots\n" + " -firstname first name for the bots\n" +
" -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" + " -lastname lastname for the bots. Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" +
" -password password for the bots\n" + " -password password for the bots\n" +
" -b, behaviours behaviours for bots. Current options p (physics), g (grab), t (teleport). Comma separated, e.g. p,g. Default is p", " -b, behaviours behaviours for bots. Comma separated, e.g. p,g. Default is p\n",
" -wear set appearance folder to load from (default: no)\n" + " current options are:" +
" -h, -help show this message" " p (physics)" +
); " g (grab)" +
" t (teleport)" +
// " c (cross)" +
" -wear set appearance folder to load from (default: no)\n" +
" -h, -help show this message");
} }
} }
} }