From b9b996be38f54f384ed614441e2275f3862fd540 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 10 Sep 2008 05:17:28 +0000 Subject: Update svn properties, minor formatting cleanup. Fix unreachable code due to typo in llDetectedGroup. --- .../Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 +- .../Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 16 ++++++++-------- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 16 ++++++++-------- .../Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9f13a10..6575eee 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -937,7 +937,7 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject == null) return new LSL_Types.LSLInteger(0); - if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID) ; + if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID) return new LSL_Types.LSLInteger(1); return new LSL_Types.LSLInteger(0); } diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index ad58069..8b5e879 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -360,10 +360,10 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - if (extraParams == String.Empty) - { - extraParams = "256"; - } + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); @@ -387,10 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - if (extraParams == String.Empty) - { - extraParams = "256"; - } + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 07d96c6..5d69673 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -229,10 +229,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - if (extraParams == String.Empty) - { - extraParams = "256"; - } + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); @@ -262,10 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - if (extraParams == String.Empty) - { - extraParams = "256"; - } + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs index 0a1f2cf..02f6cfd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs @@ -129,7 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { m_Fields[field.Name]=field; - if(field.FieldType is LSL_Types.list) // ref type, copy + if (field.FieldType is LSL_Types.list) // ref type, copy { LSL_Types.list v = (LSL_Types.list)field.GetValue(this); Object[] data = new Object[v.Data.Length]; -- cgit v1.1