aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-09-03 11:58:36 +0000
committerDr Scofield2008-09-03 11:58:36 +0000
commit3d101de3758fcc824d487752401b4e45b8518e00 (patch)
tree6000793024a1956cf1c4eba92ab56d50b3195bb1
parentMantis #2107 (diff)
downloadopensim-SC_OLD-3d101de3758fcc824d487752401b4e45b8518e00.zip
opensim-SC_OLD-3d101de3758fcc824d487752401b4e45b8518e00.tar.gz
opensim-SC_OLD-3d101de3758fcc824d487752401b4e45b8518e00.tar.bz2
opensim-SC_OLD-3d101de3758fcc824d487752401b4e45b8518e00.tar.xz
clean up and fixing a typo.
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs3
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
299 // Outside of this method, they should never be added to objectflags! 299 // Outside of this method, they should never be added to objectflags!
300 // -teravus 300 // -teravus
301 301
302 SceneObjectPart task=m_scene.GetSceneObjectPart(objID); 302 SceneObjectPart task = m_scene.GetSceneObjectPart(objID);
303 303
304 // this shouldn't ever happen.. return no permissions/objectflags. 304 // this shouldn't ever happen.. return no permissions/objectflags.
305 if (task == null) 305 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
571 571
572 public void ResetScript() 572 public void ResetScript()
573 { 573 {
574 if (m_script == null) 574 if (m_Script == null)
575 return; 575 return;
576
576 bool running = Running; 577 bool running = Running;
577 578
578 RemoveState(); 579 RemoveState();