Melanie 13cd8c17d7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

2013-05-11 02:35:26 +01:00

..

Attachments

Merge branch 'master' into careminster

2013-05-11 02:35:26 +01:00

AvatarFactory

Merge branch 'master' into careminster

2013-05-08 21:51:48 +01:00

Chat

Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.

2013-03-22 01:43:18 +00:00

Combat

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -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-13 02:10:09 +00:00

Friends

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

Gestures

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Gods

Merge branch 'master' into careminster

2013-04-25 20:47:55 +01:00

InstantMessage

Merge branch 'master' into careminster

2012-12-07 03:49:04 +00:00

Inventory

Merge branch 'master' into careminster

2013-04-30 23:45:38 +01:00

Lure

Merge branch 'master' into careminster

2013-03-28 02:29:07 +00:00

Profile

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00