Melanie dc612d0f08 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2011-11-28 11:06:38 +00:00

..

Agent

Merge branch 'master' into bigmerge

2011-11-14 20:03:47 +00:00

Asset

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

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

Avatar

Merge branch 'master' into bigmerge

2011-11-17 19:04:27 +00:00

Framework

Merge branch 'master' into bigmerge

2011-11-17 19:04:27 +00: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

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +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 bigmerge

2011-11-04 01:18:37 +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 bigmerge

2011-11-19 22:39:15 +00:00

World

Merge branch 'master' into bigmerge

2011-11-28 11:06:38 +00:00