Melanie 96409cc2ee Merge branch 'ubitwork' ...

Conflicts:
	OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
	OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs

2012-02-19 20:08:01 +01:00

..

Agent

Merge branch 'master' into careminster

2012-01-28 01:01:23 +00:00

Asset

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

2011-10-25 03:18:29 +01:00

Avatar

Merge branch 'ubitwork'

2012-02-19 20:08:01 +01:00

Framework

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2012-02-19 14:20:53 +01:00

Hypergrid

3rd way of reseting the HG Map. This time, don't use the grid service; instead keep track of which map blocks each client has seen in the region, and reset exactly those when the client closes.

2011-06-10 17:22:17 -07:00

InterGrid

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

LightShare

Introduce a LightShare kill packet ans send it when needed. Currently only

2011-12-28 09:24:02 +00:00

Resources

Moved the Mono Addins declaration of the HGFriendsModule to where the one for FriendModule is -- CoreModulePlugin.addin.xml (trying to hunt down the slowness reported by Nebadon related to HGFriends)

2011-06-06 18:20:02 -07:00

Scripting

Merge branch 'master' into careminster

2012-01-14 06:09:19 +00:00

ServiceConnectorsIn

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-02-19 14:57:51 +00:00

World

Merge branch 'master' into careminster

2012-02-19 14:57:51 +00:00