Melanie 31ab8b2fe0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-05-05 10:32:04 +01:00

..

Attachments

Merge branch 'master' into careminster

2012-05-05 10:32:04 +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

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

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 22:28:09 +01:00

Lure

Merge branch 'master' into careminster

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

Profile

Send the right name and creation date on the BasicProfileModule.

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