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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2012-10-07 02:48:28 +01:00

..

Interfaces

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00

Shared

Merge branch 'master' into careminster

2012-10-07 02:48:28 +01:00

XEngine

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00