diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ba07f9c316..cdeb117764 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // Returns if OSSL is enabled. Throws a script exception if OSSL is not allowed.. - // for safe funtions always active + // for safe funtions always active public void CheckThreatLevel() { m_host.AddScriptLPS(1); @@ -1056,7 +1056,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api targetID, part.SitTargetPosition); } - + // Get a list of all the avatars/agents in the region public LSL_List osGetAgents() { @@ -1074,7 +1074,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string osGetAgentIP(string agent) { - CheckThreatLevel(ThreatLevel.Severe, "osGetAgentIP"); + CheckThreatLevel(ThreatLevel.Severe, "osGetAgentIP"); if(!(World.Permissions.IsGod(m_host.OwnerID))) // user god always needed return ""; @@ -1651,7 +1651,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else { if (UUID.TryParse(arg, out uuid)) - { + { if(newLand.OwnerID != uuid) { changed = true; @@ -1760,7 +1760,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if(changedSeeAvs && avatar.currentParcelUUID == parcelID ) avatar.currentParcelUUID = parcelID; // force parcel flags review - + if(avatar.ControllingClient == null) return; @@ -4500,7 +4500,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// LSL_Vector CenterOfMass, center mass relative to root prim /// LSL_Vector Inertia, elements of diagonal of inertia Ixx,Iyy,Izz divided by total mass /// LSL_Vector aux, elements of upper triagle of inertia Ixy (= Iyx), Ixz (= Izx), Iyz(= Izy) divided by total mass - /// + /// public LSL_List osGetInertiaData() { CheckThreatLevel(); @@ -4513,8 +4513,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectGroup sog = m_host.ParentGroup; if(sog== null || sog.IsDeleted) - return result; - + return result; + sog.GetInertiaData(out TotalMass, out CenterOfMass, out Inertia, out aux ); if(TotalMass > 0) { @@ -4538,7 +4538,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// set inertial data /// replaces the automatic calculation of mass, center of mass and inertia - /// + /// /// /// total mass of linkset /// location of center of mass relative to root prim in local coords @@ -4562,7 +4562,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // need more checks Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z); - Vector3 Inertia; + Vector3 Inertia; float m = (float)mass; Inertia.X = m * (float)principalInertiaScaled.x; @@ -4578,7 +4578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// set inertial data as a sphere /// replaces the automatic calculation of mass, center of mass and inertia - /// + /// /// /// total mass of linkset /// size of the Box @@ -4600,7 +4600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // need more checks Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z); - Vector3 Inertia; + Vector3 Inertia; float lx = (float)boxSize.x; float ly = (float)boxSize.y; float lz = (float)boxSize.z; @@ -4620,7 +4620,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// set inertial data as a sphere /// replaces the automatic calculation of mass, center of mass and inertia - /// + /// /// /// total mass of linkset /// radius of the sphere @@ -4639,9 +4639,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; // need more checks - + Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z); - Vector3 Inertia; + Vector3 Inertia; float r = (float)radius; float m = (float)mass; float t = 0.4f * m * r * r; @@ -4656,7 +4656,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// set inertial data as a cylinder /// replaces the automatic calculation of mass, center of mass and inertia - /// + /// /// /// total mass of linkset /// radius of the cylinder @@ -4678,9 +4678,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; // need more checks - + Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z); - Vector3 Inertia; + Vector3 Inertia; float m = (float)mass; float r = (float)radius; r *= r; @@ -4702,7 +4702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// removes inertial data manual override /// default automatic calculation is used again - /// + /// /// public void osClearInertia() {