OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-03-21 00:03:03 +00:00
parent 117a862769 022366a074
commit 250b75f03b
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -681,28 +681,17 @@ namespace OpenSim.Region.CoreModules.World.Estate
TriggerEstateMessage(senderID, senderName, message); TriggerEstateMessage(senderID, senderName, message);
} }
private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) private void handleEstateDebugRegionRequest(
IClientAPI remote_client, UUID invoice, UUID senderID,
bool disableScripts, bool disableCollisions, bool disablePhysics)
{ {
if (physics) Scene.RegionInfo.RegionSettings.DisablePhysics = disablePhysics;
Scene.RegionInfo.RegionSettings.DisablePhysics = true; Scene.RegionInfo.RegionSettings.DisableScripts = disableScripts;
else Scene.RegionInfo.RegionSettings.DisableCollisions = disableCollisions;
Scene.RegionInfo.RegionSettings.DisablePhysics = false;
if (scripted)
Scene.RegionInfo.RegionSettings.DisableScripts = true;
else
Scene.RegionInfo.RegionSettings.DisableScripts = false;
if (collisionEvents)
Scene.RegionInfo.RegionSettings.DisableCollisions = true;
else
Scene.RegionInfo.RegionSettings.DisableCollisions = false;
Scene.RegionInfo.RegionSettings.Save(); Scene.RegionInfo.RegionSettings.Save();
TriggerRegionInfoChange(); TriggerRegionInfoChange();
Scene.SetSceneCoreDebug(scripted, collisionEvents, physics); Scene.SetSceneCoreDebug(scriptsOn, collisionsOn, physicsOn);
} }
private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey)