diff options
author | John Hurliman | 2009-10-27 01:46:14 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-27 01:46:14 -0700 |
commit | b498693cff9b044e8ab3c7a88a18e9d67f16461b (patch) | |
tree | da3ad1c4085eb4c4b16c0ba84d97f5938bc6763e /OpenSim/Tools/pCampBot | |
parent | * Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) t... (diff) | |
download | opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.zip opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.gz opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.bz2 opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.xz |
* Tweak to region module loading to check for a matching constructor first instead of throwing and catching exceptions
* Commenting out the MySQL startup sequence that cleans out dropped attachments under the advice that it is no longer relevant. If anything, it could be brought back as a database cleanup console command
* Updated to the latest libomv 0.8.0-pre. UUID.TryParse() will no longer throw and catch exceptions for most failed UUID parses
Diffstat (limited to 'OpenSim/Tools/pCampBot')
-rw-r--r-- | OpenSim/Tools/pCampBot/PhysicsBot.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs index 426ef29..38986a2 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs | |||
@@ -154,7 +154,7 @@ namespace pCampBot | |||
154 | client.Network.OnConnected += new NetworkManager.ConnectedCallback(this.Network_OnConnected); | 154 | client.Network.OnConnected += new NetworkManager.ConnectedCallback(this.Network_OnConnected); |
155 | client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected); | 155 | client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected); |
156 | client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); | 156 | client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); |
157 | client.Objects.OnNewPrim += Objects_NewPrim; | 157 | client.Objects.ObjectUpdate += Objects_NewPrim; |
158 | //client.Assets.OnAssetReceived += Asset_ReceivedCallback; | 158 | //client.Assets.OnAssetReceived += Asset_ReceivedCallback; |
159 | if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) | 159 | if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) |
160 | { | 160 | { |
@@ -369,8 +369,10 @@ namespace pCampBot | |||
369 | } | 369 | } |
370 | } | 370 | } |
371 | 371 | ||
372 | public void Objects_NewPrim(Simulator simulator, Primitive prim, ulong regionHandle, ushort timeDilation) | 372 | public void Objects_NewPrim(object sender, PrimEventArgs args) |
373 | { | 373 | { |
374 | Primitive prim = args.Prim; | ||
375 | |||
374 | if (prim != null) | 376 | if (prim != null) |
375 | { | 377 | { |
376 | if (prim.Textures != null) | 378 | if (prim.Textures != null) |
@@ -396,7 +398,6 @@ namespace pCampBot | |||
396 | client.Assets.RequestImage(prim.Sculpt.SculptTexture, ImageType.Normal, Asset_TextureCallback_Texture); | 398 | client.Assets.RequestImage(prim.Sculpt.SculptTexture, ImageType.Normal, Asset_TextureCallback_Texture); |
397 | } | 399 | } |
398 | } | 400 | } |
399 | |||
400 | } | 401 | } |
401 | 402 | ||
402 | 403 | ||