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

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Application

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01:00

ClientStack

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

CoreModules

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

DataSnapshot

DataSnapshot: changed those annoying messages to Debug instead of Info.

2013-06-12 17:48:20 -07:00

Framework

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

OptionalModules

Merge branch 'master' into careminster

2013-08-13 22:53:47 +01:00

Physics

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

RegionCombinerModule

Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.

2013-07-16 17:43:36 -07:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2013-08-13 22:53:47 +01:00

UserStatistics

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00