diff options
author | Melanie | 2009-10-27 11:32:11 +0000 |
---|---|---|
committer | Melanie | 2009-10-27 11:32:11 +0000 |
commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Tools/pCampBot | |
parent | Commented out instrumentation in ODEPrim.cs (diff) | |
parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
-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 | ||