Melanie 389077345f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

2012-11-11 16:31:01 +00:00

..

Attachments

Merge branch 'master' into careminster

2012-10-31 21:42:06 +00:00

AvatarFactory

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00

Chat

Merge branch 'master' into careminster

2012-10-26 21:13:01 +01:00

Combat

One more module converted: Combat/CombatModule.

2012-11-10 16:42:52 -08: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-11-11 16:31:01 +00:00

Friends

Improve efficiency of friends notification by only make one PresenceService call for all friends rather than one for each friend.

2012-10-20 02:02:13 +01:00

Gestures

One more module converted: GesturesModule.

2012-11-10 17:21:09 -08:00

Gods

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00

Groups

One more module converted: GroupsModule.

2012-11-10 17:56:25 -08:00

InstantMessage

Fix perms when linking an object. Set root part perms to the perms

2012-10-14 17:32:46 +02:00

Inventory

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00

Lure

Fix merge issues

2012-10-07 03:03:24 +01:00

Profile

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

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