Melanie f8603a215d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-08-23 01:41:47 +01:00

..

Tests

Add simple draw test for the VectorRenderModule

2012-08-02 22:14:09 +01:00

VectorRenderModule.cs

Merge branch 'master' into careminster

2012-08-23 01:41:47 +01:00