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

Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2011-11-01 23:54:09 +00:00

..

Agent

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Asset

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

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

Avatar

Fix the offline message module to revert core changes and restore avn

2011-10-28 23:10:54 +02:00

Framework

Merge branch 'master' into bigmerge

2011-10-30 10:16:25 +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

Stop displaying "Sending windowslig profile to client" when WL is disabled

2011-07-05 03:08:36 +02: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-10-26 01:27:24 +01: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 commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01:00

World

Merge branch 'master' into bigmerge

2011-11-01 23:54:09 +00:00