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

Formatting cleanup.

trunk
Jeff Ames 2009-07-11 11:47:33 +00:00
parent 123884aefe
commit cce451d9de
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -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<IMRMModule>(this);
@ -198,7 +198,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
/// <returns></returns>
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";

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -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));
}