diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 72bc2f9957..986687c65e 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -133,7 +133,7 @@ namespace OpenSim.Data.SQLite ds.Tables.Add(createItemsTable()); setupItemsCommands(itemsDa, m_conn); itemsDa.Fill(ds.Tables["primitems"]); - + ds.Tables.Add(createTerrainTable()); setupTerrainCommands(terrainDa, m_conn); @@ -990,7 +990,7 @@ namespace OpenSim.Data.SQLite cmd.ExecuteNonQuery(); } prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorR"]), Convert.ToInt32(row["ColorB"]), Convert.ToInt32(row["ColorG"])); - + return prim; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ffd70019fb..6235381980 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -3405,7 +3405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP List msg = new List(); - if(handlerGenericMessage != null) + if (handlerGenericMessage != null) { string method = Util.FieldToString(gmpack.MethodData.Method); foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList) diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 20b203a6d3..a4491f6bed 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -467,7 +467,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC public void SendGenericMessage(string method, List message) { - + } public virtual void SendLayerData(float[] map) diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9f13a10bcc..6575eee429 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 ad58069af2..8b5e879f60 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 07d96c606a..5d69673c2c 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 0a1f2cffc6..02f6cfdc7c 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];