Melanie 053e7279ca Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-08-14 02:11:13 +01:00

..

Attachments

Merge branch 'master' into careminster

2012-08-14 02:11:13 +01:00

AvatarFactory

Merge branch 'master' into careminster

2012-08-04 03:00:20 +01:00

Chat

Merge branch 'avination' into careminster

2012-07-06 20:51:18 +01:00

Combat

Mantis 60004 problems with damage and llSetDamage. In damage enabled areas this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area

2012-05-04 21:01:09 +01:00

Commands

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

Dialog

Merge branch 'master' into careminster

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

Friends

Resolve some mono compiler warnings.

2012-05-25 04:03:16 +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

Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsModule, since these led to a private blank method

2012-07-19 23:13:08 +01:00

InstantMessage

Merge branch 'master' into careminster

2012-07-19 09:47:51 +01:00

Inventory

Merge branch 'avination' into careminster

2012-07-29 16:11:20 +01:00

Lure

Merge branch 'master' into careminster

2012-05-02 01:37:51 +01:00

Profile

Remove the "Profile" config as it's covered by the replaceable interface

2012-06-04 18:22:09 +01:00