aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-07-15 17:57:48 +0100
committerUbitUmarov2012-07-15 17:57:48 +0100
commit1dc064981b8b432be30b224d4299978a0fc26857 (patch)
tree3b19f050b07af8a32c8077f520d2db94fa2ee6fb /OpenSim
parentMerge branch 'avination' into ubitwork (diff)
parentExperimentally handle UseCircuitCode synchrnonously (diff)
downloadopensim-SC-1dc064981b8b432be30b224d4299978a0fc26857.zip
opensim-SC-1dc064981b8b432be30b224d4299978a0fc26857.tar.gz
opensim-SC-1dc064981b8b432be30b224d4299978a0fc26857.tar.bz2
opensim-SC-1dc064981b8b432be30b224d4299978a0fc26857.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bd8273d..56c0992 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -701,7 +701,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
701 { 701 {
702 object[] array = new object[] { buffer, packet }; 702 object[] array = new object[] { buffer, packet };
703 703
704 Util.FireAndForget(HandleUseCircuitCode, array); 704 //Util.FireAndForget(HandleUseCircuitCode, array);
705 HandleUseCircuitCode(array);
705 706
706 return; 707 return;
707 } 708 }