Melanie 71dd55a1ce Merge branch 'master' into careminster ...

Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

2012-09-29 19:21:07 +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-29 19:21:07 +01:00