From 3d101de3758fcc824d487752401b4e45b8518e00 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Wed, 3 Sep 2008 11:58:36 +0000 Subject: clean up and fixing a typo. --- .../Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index acc88bf..b9615ec 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -299,7 +299,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // Outside of this method, they should never be added to objectflags! // -teravus - SceneObjectPart task=m_scene.GetSceneObjectPart(objID); + SceneObjectPart task = m_scene.GetSceneObjectPart(objID); // this shouldn't ever happen.. return no permissions/objectflags. if (task == null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 311ec86..e3dd9e9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -571,8 +571,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance public void ResetScript() { - if (m_script == null) + if (m_Script == null) return; + bool running = Running; RemoveState(); -- cgit v1.1