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

..

Attachments

initial introdution of physics actor building control.

2012-02-08 23:14:53 +00:00

AvatarFactory

Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).

2012-02-17 13:45:45 -08: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

…

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