Melanie 924df14c5e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs

2012-09-07 19:49:46 +01: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

2012-09-07 19:49:46 +01:00