Melanie 578174d21c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-02-27 18:05:04 +00:00

..

Tests

If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.

2012-09-06 22:12:05 +01:00

VectorRenderModule.cs

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00