Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

This commit is contained in:
Diva Canto
2012-03-20 17:33:26 -07:00

View File

@@ -670,7 +670,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)