Melanie ce5e900721 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-02-04 11:48:20 +00:00

..

Attachments

Re-Add the reading of attachment data hat was lost in the merge

2012-02-02 01:04:54 +01:00

AvatarFactory

Add avatar names to appearance log messages

2012-01-10 18:54:20 +00:00

Chat

Merge branch 'master' into bigmerge

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

2011-11-04 01:18:37 +00:00

Friends

Merge branch 'master' into careminster

2012-01-10 18:33:32 +00: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-02-04 11:48:20 +00:00

Lure

Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge

2011-10-11 22:43:27 +01:00

Profile

Profile Updates

2012-01-03 11:10:23 -05:00