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.

5 files changed, 19 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 3804017..657975b 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 return;
             }
 
-m_log.DebugFormat("MAP NAME=({0})", mapName);
+//m_log.DebugFormat("MAP NAME=({0})", mapName);
             
             // try to fetch from GridServer
             List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
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
             Thread.Sleep(bot.Random.Next(3000, 13000));
             bot.Client.Self.Movement.AtPos = false;
             bot.Client.Self.Jump(true);
-
             string randomf = talkarray[bot.Random.Next(talkarray.Length)];
             if (talkarray.Length > 1 && randomf.Length > 1)
                 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
                     MakeDefaultAppearance(wear);
                 }
 
-                Client.Self.Jump(true);
-
                 // Extract nearby region information.
                 Client.Grid.GridRegion += Manager.Grid_GridRegion;
                 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
             if (behaviourSwitches.Contains("t"))
                 behaviours.Add(new TeleportBehaviour());
 
+//            if (behaviourSwitches.Contains("c"))
+//                behaviours.Add(new CrossBehaviour());
+
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Bots configured for behaviours {0}",
                 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
             // 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.
             Console.WriteLine(
-                                     "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
-                                     "Spawns a set of bots to test an OpenSim region\n\n" +
-                                     "  -l, -loginuri      loginuri for sim to log into (required)\n" +
-                                     "  -n, -botcount      number of bots to start (default: 1)\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" +
-                                     "  -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",
-                                     "  -wear              set appearance folder to load from (default: no)\n" +
-                                     "  -h, -help          show this message"
-                                     );
+                "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
+                "Spawns a set of bots to test an OpenSim region\n\n" +
+                "  -l, -loginuri      loginuri for sim to log into (required)\n" +
+                "  -n, -botcount      number of bots to start (default: 1)\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" +
+                "  -password          password for the bots\n" +
+                "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\n",
+                "    current options are:" +
+                "       p (physics)" +
+                "       g (grab)" +
+                "       t (teleport)" +
+//                "       c (cross)" +
+                "  -wear              set appearance folder to load from (default: no)\n" +
+                "  -h, -help          show this message");
         }
     }
 }