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

..

AutoBackup

All optional modules' directives moved out of addin.xml

2012-11-13 09:48:56 -08:00

MoneyModule

Merge branch 'master' into careminster

2013-04-29 00:38:20 +01:00

NPC

Merge branch 'master' into careminster

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

SceneCommands

Add "show borders" command to show the borders of a region.

2013-03-23 00:45:21 +00:00

TreePopulator

All optional modules' directives moved out of addin.xml

2012-11-13 09:48:56 -08:00

WorldView

All optional modules' directives moved out of addin.xml

2012-11-13 09:48:56 -08:00