diff options
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 7c16bf4..7a73e3f 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
@@ -49,8 +49,15 @@ namespace pCampBot | |||
49 | 49 | ||
50 | public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events | 50 | public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events |
51 | 51 | ||
52 | public BotManager BotManager { get; private set; } | 52 | /// <summary> |
53 | private IConfig startupConfig; // bot config, passed from BotManager | 53 | /// Bot manager. |
54 | /// </summary> | ||
55 | public BotManager Manager { get; private set; } | ||
56 | |||
57 | /// <summary> | ||
58 | /// Bot config, passed from BotManager. | ||
59 | /// </summary> | ||
60 | private IConfig startupConfig; | ||
54 | 61 | ||
55 | /// <summary> | 62 | /// <summary> |
56 | /// Behaviours implemented by this bot. | 63 | /// Behaviours implemented by this bot. |
@@ -132,7 +139,7 @@ namespace pCampBot | |||
132 | Password = password; | 139 | Password = password; |
133 | LoginUri = loginUri; | 140 | LoginUri = loginUri; |
134 | 141 | ||
135 | BotManager = bm; | 142 | Manager = bm; |
136 | startupConfig = bm.Config; | 143 | startupConfig = bm.Config; |
137 | readconfig(); | 144 | readconfig(); |
138 | 145 | ||
@@ -222,7 +229,7 @@ namespace pCampBot | |||
222 | Client.Self.Jump(true); | 229 | Client.Self.Jump(true); |
223 | 230 | ||
224 | // Extract nearby region information. | 231 | // Extract nearby region information. |
225 | Client.Grid.GridRegion += BotManager.Grid_GridRegion; | 232 | Client.Grid.GridRegion += Manager.Grid_GridRegion; |
226 | uint xUint, yUint; | 233 | uint xUint, yUint; |
227 | Utils.LongToUInts(Client.Network.CurrentSim.Handle, out xUint, out yUint); | 234 | Utils.LongToUInts(Client.Network.CurrentSim.Handle, out xUint, out yUint); |
228 | ushort minX, minY, maxX, maxY; | 235 | ushort minX, minY, maxX, maxY; |
@@ -484,13 +491,13 @@ namespace pCampBot | |||
484 | 491 | ||
485 | private void GetTexture(UUID textureID) | 492 | private void GetTexture(UUID textureID) |
486 | { | 493 | { |
487 | lock (BotManager.AssetsReceived) | 494 | lock (Manager.AssetsReceived) |
488 | { | 495 | { |
489 | // Don't request assets more than once. | 496 | // Don't request assets more than once. |
490 | if (BotManager.AssetsReceived.ContainsKey(textureID)) | 497 | if (Manager.AssetsReceived.ContainsKey(textureID)) |
491 | return; | 498 | return; |
492 | 499 | ||
493 | BotManager.AssetsReceived[textureID] = false; | 500 | Manager.AssetsReceived[textureID] = false; |
494 | Client.Assets.RequestImage(textureID, ImageType.Normal, Asset_TextureCallback_Texture); | 501 | Client.Assets.RequestImage(textureID, ImageType.Normal, Asset_TextureCallback_Texture); |
495 | } | 502 | } |
496 | } | 503 | } |
@@ -502,8 +509,8 @@ namespace pCampBot | |||
502 | 509 | ||
503 | public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset) | 510 | public void Asset_ReceivedCallback(AssetDownload transfer, Asset asset) |
504 | { | 511 | { |
505 | lock (BotManager.AssetsReceived) | 512 | lock (Manager.AssetsReceived) |
506 | BotManager.AssetsReceived[asset.AssetID] = true; | 513 | Manager.AssetsReceived[asset.AssetID] = true; |
507 | 514 | ||
508 | // if (wear == "save") | 515 | // if (wear == "save") |
509 | // { | 516 | // { |