Melanie 899337b4a0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs

2012-08-29 03:31:13 +01:00

..

Tests

Add experimental DynamicTextureModule.ReuseTextures flag, currently only configurable on compile.

2012-08-28 23:06:53 +01:00

VectorRenderModule.cs

Merge branch 'master' into careminster

2012-08-29 03:31:13 +01:00