aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2009-07-11 11:47:33 +0000
committerJeff Ames2009-07-11 11:47:33 +0000
commitcce451d9de1ee9877dd089917a682127224f56d5 (patch)
tree7cf66c7afe7a2a21d0efbdadcc5080145704701f /OpenSim/Region
parentAdd bin/*.db and bin/*.ini to .gitignore. (diff)
downloadopensim-SC-cce451d9de1ee9877dd089917a682127224f56d5.zip
opensim-SC-cce451d9de1ee9877dd089917a682127224f56d5.tar.gz
opensim-SC-cce451d9de1ee9877dd089917a682127224f56d5.tar.bz2
opensim-SC-cce451d9de1ee9877dd089917a682127224f56d5.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs16
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
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
68 m_log.Info("[MRM] Enabling MRM Module"); 68 m_log.Info("[MRM] Enabling MRM Module");
69 m_scene = scene; 69 m_scene = scene;
70 70
71 // when hidden, we don't listen for client initiated script events 71 // when hidden, we don't listen for client initiated script events
72 // only making the MRM engine available for region modules 72 // only making the MRM engine available for region modules
73 if(!source.Configs["MRM"].GetBoolean("Hidden", false)) 73 if (!source.Configs["MRM"].GetBoolean("Hidden", false))
74 { 74 {
75 scene.EventManager.OnRezScript += EventManager_OnRezScript; 75 scene.EventManager.OnRezScript += EventManager_OnRezScript;
76 } 76 }
77 77
78 scene.EventManager.OnFrame += EventManager_OnFrame; 78 scene.EventManager.OnFrame += EventManager_OnFrame;
79 79
80 scene.RegisterModuleInterface<IMRMModule>(this); 80 scene.RegisterModuleInterface<IMRMModule>(this);
@@ -198,7 +198,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
198 /// <returns></returns> 198 /// <returns></returns>
199 internal string CompileFromDotNetText(string Script, string uuid) 199 internal string CompileFromDotNetText(string Script, string uuid)
200 { 200 {
201 m_log.Info("MRM 1"); 201 m_log.Info("MRM 1");
202 const string ext = ".cs"; 202 const string ext = ".cs";
203 const string FilePrefix = "MiniModule"; 203 const string FilePrefix = "MiniModule";
204 204
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
1862 1862
1863 if (part.ParentGroup == null) 1863 if (part.ParentGroup == null)
1864 { 1864 {
1865 if ((targetPos.z < ground) && disable_underground_movement) 1865 if ((targetPos.z < ground) && disable_underground_movement)
1866 targetPos.z = ground; 1866 targetPos.z = ground;
1867 part.UpdateOffSet(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); 1867 part.UpdateOffSet(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z));
1868 } 1868 }
1869 else if (part.ParentGroup.RootPart == part) 1869 else if (part.ParentGroup.RootPart == part)
1870 { 1870 {
1871 if ((targetPos.z < ground) && disable_underground_movement) 1871 if ((targetPos.z < ground) && disable_underground_movement)
1872 targetPos.z = ground; 1872 targetPos.z = ground;
1873 SceneObjectGroup parent = part.ParentGroup; 1873 SceneObjectGroup parent = part.ParentGroup;
1874 parent.UpdateGroupPosition(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); 1874 parent.UpdateGroupPosition(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z));
1875 } 1875 }