aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Tools/Compiler/Program.cs4
-rw-r--r--OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs36
-rw-r--r--OpenSim/Tools/Configger/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Tools/Configger/Util.cs8
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs4
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs6
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs6
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs6
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs8
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs6
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs4
-rw-r--r--OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs8
-rw-r--r--OpenSim/Tools/pCampBot/Bot.cs24
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs34
-rw-r--r--OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs2
-rw-r--r--OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Tools/pCampBot/pCampBot.cs6
18 files changed, 112 insertions, 80 deletions
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs
index b010eaf..9270c96 100644
--- a/OpenSim/Tools/Compiler/Program.cs
+++ b/OpenSim/Tools/Compiler/Program.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Tools.LSL.Compiler
38 class Program 38 class Program
39 { 39 {
40// Commented out because generated warning since m_positionMap could never be anything other than null 40// Commented out because generated warning since m_positionMap could never be anything other than null
41// private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; 41// private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
42 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); 42 private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
43 43
44 static void Main(string[] args) 44 static void Main(string[] args)
@@ -154,7 +154,7 @@ namespace OpenSim.Tools.LSL.Compiler
154 lslPos.Key - 1, lslPos.Value - 1, 154 lslPos.Key - 1, lslPos.Value - 1,
155 CompErr.ErrorNumber, text, severity); 155 CompErr.ErrorNumber, text, severity);
156 } 156 }
157 157
158 disp = "Completed with errors"; 158 disp = "Completed with errors";
159 159
160 if (!File.Exists(OutFile)) 160 if (!File.Exists(OutFile))
diff --git a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
index d7f8870..fe29f27 100644
--- a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Tools.lslc")] 8[assembly: AssemblyTitle("OpenSim.Tools.lslc")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.8.3.*")] 32[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
33 33
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index f1d3649..fa3a5bf 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -70,6 +70,36 @@ namespace OpenSim.Tools.Configger
70 70
71 List<string> sources = new List<string>(); 71 List<string> sources = new List<string>();
72 72
73 string masterFileName = startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
74
75 if (masterFileName == "none")
76 masterFileName = String.Empty;
77
78 if (IsUri(masterFileName))
79 {
80 if (!sources.Contains(masterFileName))
81 sources.Add(masterFileName);
82 }
83 else
84 {
85 string masterFilePath = Path.GetFullPath(
86 Path.Combine(Util.configDir(), masterFileName));
87
88 if (masterFileName != String.Empty)
89 {
90 if (File.Exists(masterFilePath))
91 {
92 if (!sources.Contains(masterFilePath))
93 sources.Add(masterFilePath);
94 }
95 else
96 {
97 m_log.ErrorFormat("Master ini file {0} not found", Path.GetFullPath(masterFilePath));
98 Environment.Exit(1);
99 }
100 }
101 }
102
73 string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); 103 string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini"));
74 104
75 if (IsUri(iniFileName)) 105 if (IsUri(iniFileName))
@@ -234,21 +264,17 @@ namespace OpenSim.Tools.Configger
234 config.Set("region_info_source", "filesystem"); 264 config.Set("region_info_source", "filesystem");
235 config.Set("allow_regionless", false); 265 config.Set("allow_regionless", false);
236 266
237 config.Set("gridmode", false);
238 config.Set("physics", "OpenDynamicsEngine"); 267 config.Set("physics", "OpenDynamicsEngine");
239 config.Set("meshing", "Meshmerizer"); 268 config.Set("meshing", "Meshmerizer");
240 config.Set("physical_prim", true); 269 config.Set("physical_prim", true);
241 config.Set("serverside_object_permissions", true); 270 config.Set("serverside_object_permissions", true);
242 config.Set("storage_prim_inventories", true);
243 config.Set("startup_console_commands_file", String.Empty); 271 config.Set("startup_console_commands_file", String.Empty);
244 config.Set("shutdown_console_commands_file", String.Empty); 272 config.Set("shutdown_console_commands_file", String.Empty);
245 config.Set("DefaultScriptEngine", "XEngine"); 273 config.Set("DefaultScriptEngine", "XEngine");
246 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 274 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
247 // life doesn't really work without this
248 config.Set("EventQueue", true);
249 } 275 }
250 276
251 return defaultConfig; 277 return defaultConfig;
252 } 278 }
253 } 279 }
254} \ No newline at end of file 280}
diff --git a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
index 359d854..50ff5a4 100644
--- a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Tools.Configger")] 8[assembly: AssemblyTitle("OpenSim.Tools.Configger")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.8.3.*")] 32[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
33 33
diff --git a/OpenSim/Tools/Configger/Util.cs b/OpenSim/Tools/Configger/Util.cs
index fe7744d..d25b666 100644
--- a/OpenSim/Tools/Configger/Util.cs
+++ b/OpenSim/Tools/Configger/Util.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Tools.Configger
58 vol = vcomps[0]; 58 vol = vcomps[0];
59 } 59 }
60 } 60 }
61 61
62 string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries); 62 string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
63 63
64 // Glob 64 // Glob
@@ -102,5 +102,11 @@ namespace OpenSim.Tools.Configger
102 102
103 return found.ToArray(); 103 return found.ToArray();
104 } 104 }
105
106 public static string configDir()
107 {
108 return ".";
109 }
110
105 } 111 }
106} 112}
diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index c1ba36b..f46948c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -37,7 +37,7 @@ namespace pCampBot
37 public abstract class AbstractBehaviour : IBehaviour 37 public abstract class AbstractBehaviour : IBehaviour
38 { 38 {
39 /// <summary> 39 /// <summary>
40 /// Abbreviated name of this behaviour. 40 /// Abbreviated name of this behaviour.
41 /// </summary> 41 /// </summary>
42 public string AbbreviatedName { get; protected set; } 42 public string AbbreviatedName { get; protected set; }
43 43
@@ -56,7 +56,7 @@ namespace pCampBot
56 Bot = bot; 56 Bot = bot;
57 } 57 }
58 58
59 public virtual void Close() 59 public virtual void Close()
60 { 60 {
61 Interrupt(); 61 Interrupt();
62 } 62 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
index 4d806fc..451cfcc 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
@@ -47,10 +47,10 @@ namespace pCampBot
47 47
48 public const int m_regionCrossingTimeout = 1000 * 60; 48 public const int m_regionCrossingTimeout = 1000 * 60;
49 49
50 public CrossBehaviour() 50 public CrossBehaviour()
51 { 51 {
52 AbbreviatedName = "c"; 52 AbbreviatedName = "c";
53 Name = "Cross"; 53 Name = "Cross";
54 } 54 }
55 55
56 public override void Action() 56 public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 59f6244..b27ece8 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -42,10 +42,10 @@ namespace pCampBot
42 /// </remarks> 42 /// </remarks>
43 public class GrabbingBehaviour : AbstractBehaviour 43 public class GrabbingBehaviour : AbstractBehaviour
44 { 44 {
45 public GrabbingBehaviour() 45 public GrabbingBehaviour()
46 { 46 {
47 AbbreviatedName = "g"; 47 AbbreviatedName = "g";
48 Name = "Grabbing"; 48 Name = "Grabbing";
49 } 49 }
50 50
51 public override void Action() 51 public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
index 521415c..e868fa9 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
@@ -45,8 +45,8 @@ namespace pCampBot
45 private Stopwatch m_StopWatch = new Stopwatch(); 45 private Stopwatch m_StopWatch = new Stopwatch();
46 private List<UUID> m_processed = new List<UUID>(); 46 private List<UUID> m_processed = new List<UUID>();
47 47
48 public InventoryDownloadBehaviour() 48 public InventoryDownloadBehaviour()
49 { 49 {
50 AbbreviatedName = "inv"; 50 AbbreviatedName = "inv";
51 Name = "Inventory"; 51 Name = "Inventory";
52 } 52 }
@@ -113,7 +113,7 @@ namespace pCampBot
113 113
114 } 114 }
115 115
116 public override void Interrupt() 116 public override void Interrupt()
117 { 117 {
118 m_interruptEvent.Set(); 118 m_interruptEvent.Set();
119 } 119 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
index 0d43781..b832d7e 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -38,10 +38,10 @@ namespace pCampBot
38 /// </summary> 38 /// </summary>
39 public class NoneBehaviour : AbstractBehaviour 39 public class NoneBehaviour : AbstractBehaviour
40 { 40 {
41 public NoneBehaviour() 41 public NoneBehaviour()
42 { 42 {
43 AbbreviatedName = "n"; 43 AbbreviatedName = "n";
44 Name = "None"; 44 Name = "None";
45 } 45 }
46 46
47 public override void Action() 47 public override void Action()
@@ -52,7 +52,7 @@ namespace pCampBot
52 Bot.Client.Self.Movement.Stop = false; 52 Bot.Client.Self.Movement.Stop = false;
53 } 53 }
54 54
55 public override void Interrupt() 55 public override void Interrupt()
56 { 56 {
57 m_interruptEvent.Set(); 57 m_interruptEvent.Set();
58 } 58 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 1ec2046..54782c1 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -45,10 +45,10 @@ namespace pCampBot
45 { 45 {
46// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 public PhysicsBehaviour2() 48 public PhysicsBehaviour2()
49 { 49 {
50 AbbreviatedName = "ph2"; 50 AbbreviatedName = "ph2";
51 Name = "Physics2"; 51 Name = "Physics2";
52 } 52 }
53 53
54 private const int TIME_WALKING = 5 * 10; // 5 seconds 54 private const int TIME_WALKING = 5 * 10; // 5 seconds
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index 81f250d..9611d72 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -43,10 +43,10 @@ namespace pCampBot
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 public TeleportBehaviour() 46 public TeleportBehaviour()
47 { 47 {
48 AbbreviatedName = "t"; 48 AbbreviatedName = "t";
49 Name = "Teleport"; 49 Name = "Teleport";
50 } 50 }
51 51
52 public override void Action() 52 public override void Action()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
index 7b4639d..42dbc8f 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -38,7 +38,7 @@ namespace pCampBot
38 /// <summary> 38 /// <summary>
39 /// This behavior is for the systematic study of some performance improvements made 39 /// This behavior is for the systematic study of some performance improvements made
40 /// for OSCC'13. 40 /// for OSCC'13.
41 /// Do nothing, but send AgentUpdate packets all the time that have only slightly 41 /// Do nothing, but send AgentUpdate packets all the time that have only slightly
42 /// different state. The delta of difference will be filtered by OpenSim early on 42 /// different state. The delta of difference will be filtered by OpenSim early on
43 /// in the packet processing pipeline. These filters did not exist before OSCC'13. 43 /// in the packet processing pipeline. These filters did not exist before OSCC'13.
44 /// </summary> 44 /// </summary>
@@ -46,10 +46,10 @@ namespace pCampBot
46 { 46 {
47// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public TwitchyBehaviour() 49 public TwitchyBehaviour()
50 { 50 {
51 AbbreviatedName = "tw"; 51 AbbreviatedName = "tw";
52 Name = "Twitchy"; 52 Name = "Twitchy";
53 } 53 }
54 54
55 private const float TWITCH = 0.0001f; 55 private const float TWITCH = 0.0001f;
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 4f28733..a142527 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -57,10 +57,10 @@ namespace pCampBot
57 { 57 {
58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 59
60 public int PacketDebugLevel 60 public int PacketDebugLevel
61 { 61 {
62 get { return m_packetDebugLevel; } 62 get { return m_packetDebugLevel; }
63 set 63 set
64 { 64 {
65 if (value == m_packetDebugLevel) 65 if (value == m_packetDebugLevel)
66 return; 66 return;
@@ -217,7 +217,7 @@ namespace pCampBot
217 Dictionary<string, IBehaviour> updatedBehaviours = new Dictionary<string, IBehaviour>(Behaviours); 217 Dictionary<string, IBehaviour> updatedBehaviours = new Dictionary<string, IBehaviour>(Behaviours);
218 218
219 if (!updatedBehaviours.ContainsKey(behaviour.AbbreviatedName)) 219 if (!updatedBehaviours.ContainsKey(behaviour.AbbreviatedName))
220 { 220 {
221 behaviour.Initialize(this); 221 behaviour.Initialize(this);
222 updatedBehaviours.Add(behaviour.AbbreviatedName, behaviour); 222 updatedBehaviours.Add(behaviour.AbbreviatedName, behaviour);
223 Behaviours = updatedBehaviours; 223 Behaviours = updatedBehaviours;
@@ -313,7 +313,7 @@ namespace pCampBot
313 foreach (IBehaviour behaviour in Behaviours.Values) 313 foreach (IBehaviour behaviour in Behaviours.Values)
314 { 314 {
315// Thread.Sleep(Random.Next(3000, 10000)); 315// Thread.Sleep(Random.Next(3000, 10000));
316 316
317 // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType()); 317 // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
318 behaviour.Action(); 318 behaviour.Action();
319 } 319 }
@@ -329,7 +329,7 @@ namespace pCampBot
329 public void Disconnect() 329 public void Disconnect()
330 { 330 {
331 ConnectionState = ConnectionState.Disconnecting; 331 ConnectionState = ConnectionState.Disconnecting;
332 332
333 foreach (IBehaviour behaviour in Behaviours.Values) 333 foreach (IBehaviour behaviour in Behaviours.Values)
334 behaviour.Close(); 334 behaviour.Close();
335 335
@@ -337,7 +337,7 @@ namespace pCampBot
337 } 337 }
338 338
339 public void Connect() 339 public void Connect()
340 { 340 {
341 Thread connectThread = new Thread(ConnectInternal); 341 Thread connectThread = new Thread(ConnectInternal);
342 connectThread.Name = Name; 342 connectThread.Name = Name;
343 connectThread.IsBackground = true; 343 connectThread.IsBackground = true;
@@ -508,7 +508,7 @@ namespace pCampBot
508 InventoryFolder clothfolder = FindClothingFolder(); 508 InventoryFolder clothfolder = FindClothingFolder();
509 UUID transid = UUID.Random(); 509 UUID transid = UUID.Random();
510 List<InventoryBase> listwearables = new List<InventoryBase>(); 510 List<InventoryBase> listwearables = new List<InventoryBase>();
511 511
512 for (int i = 0; i < clothing.Length; i++) 512 for (int i = 0; i < clothing.Length; i++)
513 { 513 {
514 UUID assetID = UUID.Random(); 514 UUID assetID = UUID.Random();
@@ -707,7 +707,7 @@ namespace pCampBot
707 m_log.Warn(string.Format("Error requesting {0} {1}", texture ? "texture" : "mesh", assetID), e); 707 m_log.Warn(string.Format("Error requesting {0} {1}", texture ? "texture" : "mesh", assetID), e);
708 } 708 }
709 } 709 }
710 710
711 public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture) 711 public void Asset_TextureCallback_Texture(TextureRequestState state, AssetTexture assetTexture)
712 { 712 {
713 if (state == TextureRequestState.Finished) 713 if (state == TextureRequestState.Finished)
@@ -722,7 +722,7 @@ namespace pCampBot
722 lock (Manager.AssetsReceived) 722 lock (Manager.AssetsReceived)
723 Manager.AssetsReceived[assetMesh.AssetID] = success; 723 Manager.AssetsReceived[assetMesh.AssetID] = success;
724 } 724 }
725 725
726 public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset) 726 public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset)
727 { 727 {
728 lock (Manager.AssetsReceived) 728 lock (Manager.AssetsReceived)
@@ -733,7 +733,7 @@ namespace pCampBot
733// SaveAsset((AssetWearable) asset); 733// SaveAsset((AssetWearable) asset);
734// } 734// }
735 } 735 }
736 736
737 private void PacketReceivedDebugHandler(object o, PacketReceivedEventArgs args) 737 private void PacketReceivedDebugHandler(object o, PacketReceivedEventArgs args)
738 { 738 {
739 Packet p = args.Packet; 739 Packet p = args.Packet;
@@ -741,7 +741,7 @@ namespace pCampBot
741 Simulator s = args.Simulator; 741 Simulator s = args.Simulator;
742 742
743 m_log.DebugFormat( 743 m_log.DebugFormat(
744 "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}", 744 "[BOT]: Bot {0} received from {1} packet {2} #{3}, rel {4}, res {5}",
745 Name, s.Name, p.Type, h.Sequence, h.Reliable, h.Resent); 745 Name, s.Name, p.Type, h.Sequence, h.Reliable, h.Resent);
746 } 746 }
747 } 747 }
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0af9592..37dc0d9 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -219,14 +219,14 @@ namespace pCampBot
219 HandleDisconnect); 219 HandleDisconnect);
220 220
221 m_console.Commands.AddCommand( 221 m_console.Commands.AddCommand(
222 "Bots", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", 222 "Bots", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]",
223 "Add a behaviour to a bot", 223 "Add a behaviour to a bot",
224 "If no bot number is specified then behaviour is added to all bots.\n" 224 "If no bot number is specified then behaviour is added to all bots.\n"
225 + "Can be performed on connected or disconnected bots.", 225 + "Can be performed on connected or disconnected bots.",
226 HandleAddBehaviour); 226 HandleAddBehaviour);
227 227
228 m_console.Commands.AddCommand( 228 m_console.Commands.AddCommand(
229 "Bots", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", 229 "Bots", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]",
230 "Remove a behaviour from a bot", 230 "Remove a behaviour from a bot",
231 "If no bot number is specified then behaviour is added to all bots.\n" 231 "If no bot number is specified then behaviour is added to all bots.\n"
232 + "Can be performed on connected or disconnected bots.", 232 + "Can be performed on connected or disconnected bots.",
@@ -250,14 +250,14 @@ namespace pCampBot
250 "Bots", false, "show bots", "show bots", "Shows the status of all bots.", HandleShowBotsStatus); 250 "Bots", false, "show bots", "show bots", "Shows the status of all bots.", HandleShowBotsStatus);
251 251
252 m_console.Commands.AddCommand( 252 m_console.Commands.AddCommand(
253 "Bots", false, "show bot", "show bot <bot-number>", 253 "Bots", false, "show bot", "show bot <bot-number>",
254 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus); 254 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
255 255
256 m_console.Commands.AddCommand( 256 m_console.Commands.AddCommand(
257 "Debug", 257 "Debug",
258 false, 258 false,
259 "debug lludp packet", 259 "debug lludp packet",
260 "debug lludp packet <level> <avatar-first-name> <avatar-last-name>", 260 "debug lludp packet <level> <avatar-first-name> <avatar-last-name>",
261 "Turn on received packet logging.", 261 "Turn on received packet logging.",
262 "If level > 0 then all received packets that are not duplicates are logged.\n" 262 "If level > 0 then all received packets that are not duplicates are logged.\n"
263 + "If level <= 0 then no received packets are logged.", 263 + "If level <= 0 then no received packets are logged.",
@@ -317,7 +317,7 @@ namespace pCampBot
317 // We must give each bot its own list of instantiated behaviours since they store state. 317 // We must give each bot its own list of instantiated behaviours since they store state.
318 List<IBehaviour> behaviours = new List<IBehaviour>(); 318 List<IBehaviour> behaviours = new List<IBehaviour>();
319 319
320 // Hard-coded for now 320 // Hard-coded for now
321 foreach (string abName in abbreviatedNames) 321 foreach (string abName in abbreviatedNames)
322 { 322 {
323 IBehaviour newBehaviour = null; 323 IBehaviour newBehaviour = null;
@@ -534,7 +534,7 @@ namespace pCampBot
534 } 534 }
535 535
536 private void HandleConnect(string module, string[] cmd) 536 private void HandleConnect(string module, string[] cmd)
537 { 537 {
538 lock (m_bots) 538 lock (m_bots)
539 { 539 {
540 int botsToConnect; 540 int botsToConnect;
@@ -607,7 +607,7 @@ namespace pCampBot
607 } 607 }
608 608
609 MainConsole.Instance.OutputFormat( 609 MainConsole.Instance.OutputFormat(
610 "Added behaviours {0} to bot {1}", 610 "Added behaviours {0} to bot {1}",
611 string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name); 611 string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
612 } 612 }
613 } 613 }
@@ -665,7 +665,7 @@ namespace pCampBot
665 } 665 }
666 666
667 MainConsole.Instance.OutputFormat( 667 MainConsole.Instance.OutputFormat(
668 "Removed behaviours {0} from bot {1}", 668 "Removed behaviours {0} from bot {1}",
669 string.Join(", ", behavioursRemoved.ConvertAll<string>(b => b.Name).ToArray()), bot.Name); 669 string.Join(", ", behavioursRemoved.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
670 } 670 }
671 } 671 }
@@ -779,7 +779,7 @@ namespace pCampBot
779 string rawValue = cmd[3]; 779 string rawValue = cmd[3];
780 780
781 if (key == "SEND_AGENT_UPDATES") 781 if (key == "SEND_AGENT_UPDATES")
782 { 782 {
783 bool newSendAgentUpdatesSetting; 783 bool newSendAgentUpdatesSetting;
784 784
785 if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newSendAgentUpdatesSetting)) 785 if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newSendAgentUpdatesSetting))
@@ -873,10 +873,10 @@ namespace pCampBot
873 totals[bot.ConnectionState]++; 873 totals[bot.ConnectionState]++;
874 874
875 cdt.AddRow( 875 cdt.AddRow(
876 bot.Name, 876 bot.Name,
877 currentSim != null ? currentSim.Name : "(none)", 877 currentSim != null ? currentSim.Name : "(none)",
878 bot.ConnectionState, 878 bot.ConnectionState,
879 bot.SimulatorsCount, 879 bot.SimulatorsCount,
880 string.Join(",", bot.Behaviours.Keys.ToArray())); 880 string.Join(",", bot.Behaviours.Keys.ToArray()));
881 } 881 }
882 } 882 }
@@ -930,7 +930,7 @@ namespace pCampBot
930 ConsoleDisplayList statusCdl = new ConsoleDisplayList(); 930 ConsoleDisplayList statusCdl = new ConsoleDisplayList();
931 931
932 statusCdl.AddRow( 932 statusCdl.AddRow(
933 "Behaviours", 933 "Behaviours",
934 string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll<string>(b => b.Name).ToArray())); 934 string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll<string>(b => b.Name).ToArray()));
935 935
936 GridClient botClient = bot.Client; 936 GridClient botClient = bot.Client;
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 660c630..beb8413 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -32,7 +32,7 @@ namespace pCampBot.Interfaces
32 public interface IBehaviour 32 public interface IBehaviour
33 { 33 {
34 /// <summary> 34 /// <summary>
35 /// Abbreviated name of this behaviour. 35 /// Abbreviated name of this behaviour.
36 /// </summary> 36 /// </summary>
37 string AbbreviatedName { get; } 37 string AbbreviatedName { get; }
38 38
diff --git a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
index f551135..8b96c92 100644
--- a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("pCampBot")] 8[assembly: AssemblyTitle("pCampBot")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.8.3.*")] 32[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
33 33
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 1fb0e03..f162f10 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -64,8 +64,8 @@ namespace pCampBot
64 Help(); 64 Help();
65 } 65 }
66 else if ( 66 else if (
67 commandLineConfig.Get("firstname") == null 67 commandLineConfig.Get("firstname") == null
68 || commandLineConfig.Get("lastname") == null 68 || commandLineConfig.Get("lastname") == null
69 || commandLineConfig.Get("password") == null) 69 || commandLineConfig.Get("password") == null)
70 { 70 {
71 Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots."); 71 Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
@@ -93,7 +93,7 @@ namespace pCampBot
93 93
94 if (botConfig != null) 94 if (botConfig != null)
95 { 95 {
96 bm.InitBotSendAgentUpdates 96 bm.InitBotSendAgentUpdates
97 = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates); 97 = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
98 bm.InitBotRequestObjectTextures 98 bm.InitBotRequestObjectTextures
99 = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures); 99 = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);