diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Tools/pCampBot/Behaviours | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Tools/pCampBot/Behaviours')
8 files changed, 24 insertions, 24 deletions
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; |