Melanie 710381e838 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs

2013-03-13 02:02:46 +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-03-13 02:02:46 +00:00