aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools/pCampBot
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-14 23:37:07 +0100
committerJustin Clark-Casey (justincc)2013-08-14 23:37:07 +0100
commit5011c657b5b8127927c75c4e1db496c15a394b3a (patch)
treeb09350d3c064db64d4bb3bcd79d62f595fcea059 /OpenSim/Tools/pCampBot
parentminor: Comment out AvatarPicketSearch caps log message for now, which is occu... (diff)
downloadopensim-SC_OLD-5011c657b5b8127927c75c4e1db496c15a394b3a.zip
opensim-SC_OLD-5011c657b5b8127927c75c4e1db496c15a394b3a.tar.gz
opensim-SC_OLD-5011c657b5b8127927c75c4e1db496c15a394b3a.tar.bz2
opensim-SC_OLD-5011c657b5b8127927c75c4e1db496c15a394b3a.tar.xz
Actually implement the bot request object textures switch started in 225cf0d.
Forgot to propogate it down to bot level.
Diffstat (limited to 'OpenSim/Tools/pCampBot')
-rw-r--r--OpenSim/Tools/pCampBot/Bot.cs8
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs1
2 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index dac8ccb..32bf32b 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -59,6 +59,11 @@ namespace pCampBot
59 public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events 59 public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events
60 60
61 /// <summary> 61 /// <summary>
62 /// Controls whether bots request textures for the object information they receive
63 /// </summary>
64 public bool RequestObjectTextures { get; set; }
65
66 /// <summary>
62 /// Bot manager. 67 /// Bot manager.
63 /// </summary> 68 /// </summary>
64 public BotManager Manager { get; private set; } 69 public BotManager Manager { get; private set; }
@@ -469,6 +474,9 @@ namespace pCampBot
469 474
470 public void Objects_NewPrim(object sender, PrimEventArgs args) 475 public void Objects_NewPrim(object sender, PrimEventArgs args)
471 { 476 {
477 if (!RequestObjectTextures)
478 return;
479
472 Primitive prim = args.Prim; 480 Primitive prim = args.Prim;
473 481
474 if (prim != null) 482 if (prim != null)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 397a98e..dee02c3 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -300,6 +300,7 @@ namespace pCampBot
300 Bot pb = new Bot(bm, behaviours, firstName, lastName, password, startLocation, loginUri); 300 Bot pb = new Bot(bm, behaviours, firstName, lastName, password, startLocation, loginUri);
301 pb.wear = wearSetting; 301 pb.wear = wearSetting;
302 pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates; 302 pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates;
303 pb.RequestObjectTextures = InitBotRequestObjectTextures;
303 304
304 pb.OnConnected += handlebotEvent; 305 pb.OnConnected += handlebotEvent;
305 pb.OnDisconnected += handlebotEvent; 306 pb.OnDisconnected += handlebotEvent;