aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
authorMelanie2009-09-03 21:04:06 +0100
committerMelanie2009-09-03 21:04:06 +0100
commit5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf (patch)
treee48751a92b2ac8bad613c0a1355a9206fe596fd0 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parentRemove the distinction between password and login key in the authentication (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.zip
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.gz
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.bz2
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 55b100b..fddba86 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -457,6 +457,8 @@ namespace OpenSim.Region.Framework.Scenes
457 457
458 void SendInventoryComplete(IAsyncResult iar) 458 void SendInventoryComplete(IAsyncResult iar)
459 { 459 {
460 SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
461 d.EndInvoke(iar);
460 } 462 }
461 463
462 /// <summary> 464 /// <summary>
@@ -622,6 +624,8 @@ namespace OpenSim.Region.Framework.Scenes
622 624
623 private void PurgeFolderCompleted(IAsyncResult iar) 625 private void PurgeFolderCompleted(IAsyncResult iar)
624 { 626 {
627 PurgeFolderDelegate d = (PurgeFolderDelegate)iar.AsyncState;
628 d.EndInvoke(iar);
625 } 629 }
626 } 630 }
627} 631}