Melanie 1dd75fcdb4 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs

2012-09-17 14:15:22 +01:00

..

Agent

Fix slow loading of task inventory

2012-07-19 12:27:36 +02:00

Asset

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

Avatar

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

Framework

Merge branch 'master' into careminster

2012-09-17 14:15:22 +01:00

Hypergrid

Revamp map block sending to eliminate overload of the grid server connection

2012-07-08 10:44:53 +02:00

InterGrid

Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework

2012-07-25 23:27:00 +01:00

LightShare

Merge branch 'master' into careminster

2012-05-27 19:24:30 +01:00

Resources

Revert "Move addin information to CoreModulePlugin.addin.xml"

2012-09-09 13:50:44 -04:00

Scripting

Merge branch 'avination' into careminster

2012-09-10 13:53:00 +01:00

ServiceConnectorsIn

Comment out the neighbour and land in connectors from info logging that they are starting up

2012-06-20 00:42:54 +01:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

World

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00