Melanie 48569e856a Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-10-30 01:02:20 +00:00

..

Agent

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

Asset

Merge branch 'master' into careminster

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

Avatar

Merge branch 'master' into careminster

2012-10-28 00:30:55 +01:00

Framework

Merge branch 'master' into careminster

2012-10-26 21:13:01 +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

Refactor: Move Dwell reply to a module that can be disabled. The prior,

2012-10-21 21:12:34 +01:00

Scripting

Merge branch 'master' into careminster

2012-10-26 21:13:01 +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 commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster

2012-09-27 15:46:35 +01:00

World

Merge branch 'master' into careminster

2012-10-30 01:02:20 +00:00