aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorSean McNamara2011-02-28 15:08:35 -0500
committerSean McNamara2011-02-28 15:08:35 -0500
commit60989521a6a60bb5610784936797df0683a55527 (patch)
tree51fd99afe41459221ff74a78be965001ff680df9 /OpenSim/Region/ClientStack
parentFix small bug with remove region; update settings docs. (diff)
parentFix a few little things (diff)
downloadopensim-SC-60989521a6a60bb5610784936797df0683a55527.zip
opensim-SC-60989521a6a60bb5610784936797df0683a55527.tar.gz
opensim-SC-60989521a6a60bb5610784936797df0683a55527.tar.bz2
opensim-SC-60989521a6a60bb5610784936797df0683a55527.tar.xz
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 584c577..583214c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
845 845
846 private void HandleUseCircuitCode(object o) 846 private void HandleUseCircuitCode(object o)
847 { 847 {
848 DateTime startTime = DateTime.Now; 848// DateTime startTime = DateTime.Now;
849 object[] array = (object[])o; 849 object[] array = (object[])o;
850 UDPPacketBuffer buffer = (UDPPacketBuffer)array[0]; 850 UDPPacketBuffer buffer = (UDPPacketBuffer)array[0];
851 UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1]; 851 UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1];