Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-19 01:59:49 +00:00
18 changed files with 585 additions and 418 deletions

View File

@@ -845,7 +845,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void HandleUseCircuitCode(object o)
{
DateTime startTime = DateTime.Now;
// DateTime startTime = DateTime.Now;
object[] array = (object[])o;
UDPPacketBuffer buffer = (UDPPacketBuffer)array[0];
UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1];