diff options
| author | Melanie | 2011-02-19 01:59:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-19 01:59:49 +0000 |
| commit | 4834b476798cce715d0b5b286a6f20bc577bdabd (patch) | |
| tree | 5bf15fa7978daaff116147838f84e4915bca1777 /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Add needed dummy to sample money (diff) | |
| parent | Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff) | |
| download | opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.zip opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2 opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index b7f9d87..c865c0f 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]; |