Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-03-21 00:09:18 +00:00

View File

@@ -691,7 +691,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
Scene.RegionInfo.RegionSettings.Save();
TriggerRegionInfoChange();
Scene.SetSceneCoreDebug(scriptsOn, collisionsOn, physicsOn);
Scene.SetSceneCoreDebug(disableScripts, disableCollisions, disablePhysics);
}
private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey)