Melanie 206bfe0657 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs

2013-01-16 17:05:37 +00:00

..

Properties

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

Tests

Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests

2012-11-24 03:15:24 +00: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

First stab at cleaning up Caps. Compiles. Untested.

2011-04-30 09:24:15 -07:00

J2KImage.cs

Merge branch 'master' into careminster

2012-01-21 19:52:33 +00:00

LLClientView.cs

Merge branch 'master' into careminster

2013-01-16 17:05:37 +00:00

LLImageManager.cs

Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.

2012-01-19 23:09:16 +00:00

LLUDPClient.cs

Merge branch 'master' into careminster

2013-01-16 17:05:37 +00:00

LLUDPServer.cs

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

OpenSimUDPBase.cs

Merge branch 'master' into careminster

2012-12-21 22:13:41 +00:00

OutgoingPacket.cs

First stab at cleaning up Caps. Compiles. Untested.

2011-04-30 09:24:15 -07:00

PacketPool.cs

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

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

ThrottleRates.cs

First stab at cleaning up Caps. Compiles. Untested.

2011-04-30 09:24:15 -07:00

TokenBucket.cs

minor: remove some mono compiler warnings

2011-07-30 03:19:00 +01:00

UnackedPacketCollection.cs

minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks

2011-10-12 19:35:40 +01:00