Melanie bef03fb30b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Tests

Fix an issue where under teleport v2 protocol, teleporting from regions in an line from A->B->C would not close region A when reaching C

2013-08-08 23:29:30 +01:00

IncomingPacket.cs

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00

IncomingPacketHistoryCollection.cs

…

J2KImage.cs

Merge branch 'master' into careminster

2013-07-04 22:32:58 +01:00

LLClientView.cs

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01:00

LLImageManager.cs

Do some simple queue empty checks in the main outgoing udp loop instead of always performing these on a separate fired thread.

2013-07-21 08:56:48 -07:00

LLUDPClient.cs

Merge branch 'master' into careminster

2013-07-24 04:45:07 +01:00

LLUDPServer.cs

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

OpenSimUDPBase.cs

Merge branch 'master' into careminster

2013-07-24 04:45:07 +01:00

OutgoingPacket.cs

…

PacketPool.cs

Packet headers are not zero-encoded so don't try to zero-decode these in PacketPool.GetType()

2013-08-16 00:58:25 +01:00

ThrottleRates.cs

…

TokenBucket.cs

…

UnackedPacketCollection.cs

…