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

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-04-07 04:52:14 +01:00

..

Attachments

Merge branch 'master' into careminster

2012-04-07 04:52:14 +01:00

AvatarFactory

Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.

2012-02-26 02:36:34 +01: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 careminster

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

Friends

Make default "show friends" console command show friends fetched from the friends service.

2012-03-30 01:57:38 +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-03-18 20:44:56 +00:00

Lure

Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge

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

Profile

Send the right name and creation date on the BasicProfileModule.

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