From 225cf0d0102d05721bd01120928b9d1d85c811a7 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 14 Aug 2013 19:53:10 +0100
Subject: [PATCH] Add pCampbot RequestObjectTextures ini setting to control
 whether textures are requested for received objects.

---
 OpenSim/Tools/pCampBot/BotManager.cs |  7 +++++++
 OpenSim/Tools/pCampBot/pCampBot.cs   |  2 ++
 bin/pCampbot.ini.example             | 10 ++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0fdfa0e050..5988584f0a 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -67,6 +67,11 @@ namespace pCampBot
         /// </summary>
         public bool InitBotSendAgentUpdates { get; set; }
 
+        /// <summary>
+        /// Controls whether bots request textures for the object information they receive
+        /// </summary>
+        public bool InitBotRequestObjectTextures { get; set; }
+
         /// <summary>
         /// Created bots, whether active or inactive.
         /// </summary>
@@ -93,6 +98,7 @@ namespace pCampBot
         public BotManager()
         {
             InitBotSendAgentUpdates = true;
+            InitBotRequestObjectTextures = true;
 
             LoginDelay = DefaultLoginDelay;
 
@@ -176,6 +182,7 @@ namespace pCampBot
 
             MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
             MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates);
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: InitBotRequestObjectTextures is {0}", InitBotRequestObjectTextures);
 
             for (int i = 0; i < botcount; i++)
             {
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index c8b6304cef..b02f9170f9 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -88,6 +88,8 @@ namespace pCampBot
                     {
                         bm.InitBotSendAgentUpdates 
                             = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
+                        bm.InitBotRequestObjectTextures
+                            = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);
                     }
                 }
 
diff --git a/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
index 81cdcf4b1d..f44feaee1f 100644
--- a/bin/pCampbot.ini.example
+++ b/bin/pCampbot.ini.example
@@ -3,7 +3,13 @@
 
 [Bot]
   ; Control whether bots should regularly send agent updates
-  ; Not sending agent updates will reduce CPU requirements for pCampbot but greatly 
-  ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets.
   ; Defaults to true.
   SendAgentUpdates = true
+
+  ; Control whether bots will requests textures when receiving object information
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; reduce the realism compared to viewers which requests such texture data if not already cached.
+  ; Defaults to true.
+  RequestObjectTextures = true