Melanie 389077345f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

2012-11-11 16:31:01 +00:00

..

Tests

Adjust namespce of FlotsamCache

2012-09-09 14:35:48 -04: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-11-11 16:31:01 +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