Melanie 90305001de Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-04-27 17:09:49 +01:00

..

Attachments

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

AvatarFactory

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

Chat

Merge branch 'master' into careminster

2012-04-23 20:44:41 +01:00

Combat

Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.

2011-03-25 23:05:51 +00:00

Dialog

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Friends

Add regression test for teleporting an agent between separated regions on the same simulator.

2012-04-27 00:58:54 +01:00

Gestures

Fix build break

2011-01-18 01:48:37 +00:00

Gods

Adapt GodsModule to core changes

2011-12-05 21:26:43 +01:00

Groups

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

InstantMessage

Add some logging

2012-01-17 17:36:26 +01:00

Inventory

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

Lure

Merge branch 'master' into careminster

2012-04-20 16:48:43 +01:00

Profile

Send the right name and creation date on the BasicProfileModule.

2012-03-01 19:55:51 -08:00