aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-14 19:53:10 +0100
committerJustin Clark-Casey (justincc)2013-08-14 19:53:10 +0100
commit225cf0d0102d05721bd01120928b9d1d85c811a7 (patch)
treeb399d69f04f69f856ea577984559af3b2ad46b4e
parentAdd method doc to Scene.RemoveClient() to ask any callers to use Scene.Incomi... (diff)
downloadopensim-SC_OLD-225cf0d0102d05721bd01120928b9d1d85c811a7.zip
opensim-SC_OLD-225cf0d0102d05721bd01120928b9d1d85c811a7.tar.gz
opensim-SC_OLD-225cf0d0102d05721bd01120928b9d1d85c811a7.tar.bz2
opensim-SC_OLD-225cf0d0102d05721bd01120928b9d1d85c811a7.tar.xz
Add pCampbot RequestObjectTextures ini setting to control whether textures are requested for received objects.
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs7
-rw-r--r--OpenSim/Tools/pCampBot/pCampBot.cs2
-rw-r--r--bin/pCampbot.ini.example10
3 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0fdfa0e..5988584 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -68,6 +68,11 @@ namespace pCampBot
68 public bool InitBotSendAgentUpdates { get; set; } 68 public bool InitBotSendAgentUpdates { get; set; }
69 69
70 /// <summary> 70 /// <summary>
71 /// Controls whether bots request textures for the object information they receive
72 /// </summary>
73 public bool InitBotRequestObjectTextures { get; set; }
74
75 /// <summary>
71 /// Created bots, whether active or inactive. 76 /// Created bots, whether active or inactive.
72 /// </summary> 77 /// </summary>
73 protected List<Bot> m_lBot; 78 protected List<Bot> m_lBot;
@@ -93,6 +98,7 @@ namespace pCampBot
93 public BotManager() 98 public BotManager()
94 { 99 {
95 InitBotSendAgentUpdates = true; 100 InitBotSendAgentUpdates = true;
101 InitBotRequestObjectTextures = true;
96 102
97 LoginDelay = DefaultLoginDelay; 103 LoginDelay = DefaultLoginDelay;
98 104
@@ -176,6 +182,7 @@ namespace pCampBot
176 182
177 MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay); 183 MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
178 MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates); 184 MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates);
185 MainConsole.Instance.OutputFormat("[BOT MANAGER]: InitBotRequestObjectTextures is {0}", InitBotRequestObjectTextures);
179 186
180 for (int i = 0; i < botcount; i++) 187 for (int i = 0; i < botcount; i++)
181 { 188 {
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index c8b6304..b02f917 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -88,6 +88,8 @@ namespace pCampBot
88 { 88 {
89 bm.InitBotSendAgentUpdates 89 bm.InitBotSendAgentUpdates
90 = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates); 90 = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
91 bm.InitBotRequestObjectTextures
92 = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);
91 } 93 }
92 } 94 }
93 95
diff --git a/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
index 81cdcf4..f44feae 100644
--- a/bin/pCampbot.ini.example
+++ b/bin/pCampbot.ini.example
@@ -3,7 +3,13 @@
3 3
4[Bot] 4[Bot]
5 ; Control whether bots should regularly send agent updates 5 ; Control whether bots should regularly send agent updates
6 ; Not sending agent updates will reduce CPU requirements for pCampbot but greatly 6 ; Not doing this will reduce CPU requirements for pCampbot but greatly
7 ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets 7 ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets.
8 ; Defaults to true. 8 ; Defaults to true.
9 SendAgentUpdates = true 9 SendAgentUpdates = true
10
11 ; Control whether bots will requests textures when receiving object information
12 ; Not doing this will reduce CPU requirements for pCampbot but greatly
13 ; reduce the realism compared to viewers which requests such texture data if not already cached.
14 ; Defaults to true.
15 RequestObjectTextures = true