Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
This commit is contained in:
Melanie
2013-05-04 01:22:12 +01:00
41 changed files with 1439 additions and 1678 deletions

View File

@@ -562,6 +562,10 @@ namespace OpenSim.Region.Framework.Scenes
get { return false; }
}
public virtual void Start()
{
}
public void Restart()
{
// This has to be here to fire the event