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

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2013-07-13 00:47:58 +01:00

..

Interfaces

Update SmartThreadPool to latest version 2.2.3 with a major and minor change.

2013-05-01 19:01:43 +01:00

Shared

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

XEngine

Merge branch 'master' into careminster

2013-05-01 21:39:49 +01:00