From cce451d9de1ee9877dd089917a682127224f56d5 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 11 Jul 2009 11:47:33 +0000 Subject: Formatting cleanup. --- .../OptionalModules/Scripting/Minimodule/MRMModule.cs | 16 ++++++++-------- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 2b84016..53145e2 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -68,13 +68,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule m_log.Info("[MRM] Enabling MRM Module"); m_scene = scene; - // when hidden, we don't listen for client initiated script events - // only making the MRM engine available for region modules - if(!source.Configs["MRM"].GetBoolean("Hidden", false)) - { - scene.EventManager.OnRezScript += EventManager_OnRezScript; - } - + // when hidden, we don't listen for client initiated script events + // only making the MRM engine available for region modules + if (!source.Configs["MRM"].GetBoolean("Hidden", false)) + { + scene.EventManager.OnRezScript += EventManager_OnRezScript; + } + scene.EventManager.OnFrame += EventManager_OnFrame; scene.RegisterModuleInterface(this); @@ -198,7 +198,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule /// internal string CompileFromDotNetText(string Script, string uuid) { - m_log.Info("MRM 1"); + m_log.Info("MRM 1"); const string ext = ".cs"; const string FilePrefix = "MiniModule"; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 15188c5..a9af260 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -1862,14 +1862,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (part.ParentGroup == null) { - if ((targetPos.z < ground) && disable_underground_movement) - targetPos.z = ground; + if ((targetPos.z < ground) && disable_underground_movement) + targetPos.z = ground; part.UpdateOffSet(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } else if (part.ParentGroup.RootPart == part) { - if ((targetPos.z < ground) && disable_underground_movement) - targetPos.z = ground; + if ((targetPos.z < ground) && disable_underground_movement) + targetPos.z = ground; SceneObjectGroup parent = part.ParentGroup; parent.UpdateGroupPosition(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } -- cgit v1.1