Melanie 90305001de Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-04-27 17:09:49 +01:00

..

Tests

Add regression test for teleporting an agent between separated regions on the same simulator.

2012-04-27 00:58:54 +01:00

CenomeAssetCache.cs

Formatting cleanup.

2010-02-15 19:21:56 +09:00

CoreAssetCache.cs

* Removing cruft left over from the conversion to the new texture sending and UDP code

2009-10-20 10:33:23 -07:00

FlotsamAssetCache.cs

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

GlynnTuckerAssetCache.cs

* Removing cruft left over from the conversion to the new texture sending and UDP code

2009-10-20 10:33:23 -07:00