diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs index bccda24e41..d00253086c 100644 --- a/OpenSim/Framework/Cache.cs +++ b/OpenSim/Framework/Cache.cs @@ -495,7 +495,7 @@ namespace Opensim.Framework public void Invalidate(LLUUID uuid) { - if(!m_Lookup.ContainsKey(uuid)) + if (!m_Lookup.ContainsKey(uuid)) return; CacheItemBase item = m_Lookup[uuid]; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs index cc088a0fc4..03bbaf39a1 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory public void Initialise(Scene scene, IConfigSource config) { - if(!m_Scenelist.Contains(scene)) + if (!m_Scenelist.Contains(scene)) { m_Scenelist.Add(scene); diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index bdfe664eac..d534ffce1d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs @@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes public void DeselectPrim(uint primLocalID, IClientAPI remoteClient) { SceneObjectPart part = GetSceneObjectPart(primLocalID); - if(part == null) + if (part == null) return; bool isAttachment = false; @@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes // if (part.ParentGroup == null) { - if(part.IsAttachment) + if (part.IsAttachment) isAttachment = true; else part.ScheduleFullUpdate(); diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index d6aef95988..1432912235 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -1177,7 +1177,7 @@ namespace OpenSim.Region.Environment.Scenes public void ClearUndoState() { - lock(m_undo) + lock (m_undo) { m_undo.Clear(); } @@ -2449,7 +2449,7 @@ namespace OpenSim.Region.Environment.Scenes { if (m_parentGroup != null) { - lock(m_undo) + lock (m_undo) { if (m_undo.Count > 0) { @@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes public void Undo() { - lock(m_undo) + lock (m_undo) { if (m_undo.Count > 0) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c8c1ac3b6c..9604828fdf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5536,48 +5536,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SetFullBright(part, face , st); break; - case (int)ScriptBaseClass.PRIM_MATERIAL: - if (remain < 1) - return; - if (part != null) - { - /* Unhandled at this time - sends "Unhandled" message - will enable when available - byte material = (byte)Convert.ToByte( rules.Data[idx++]); - part.Material = material; - */ - return; - } - break; - case (int)ScriptBaseClass.PRIM_PHANTOM: - if (remain < 1) - return; - - string ph = rules.Data[idx++].ToString(); - bool phantom; - - if(ph.Equals("1")) - phantom = true; - else - phantom = false; - - part.ScriptSetPhantomStatus(phantom); - part.ScheduleFullUpdate(); - break; - case (int)ScriptBaseClass.PRIM_PHYSICS: - if (remain < 1) - return; - string phy = rules.Data[idx++].ToString(); - bool physics; - - if(phy.Equals("1")) - physics = true; - else - physics = false; - - m_host.ScriptSetPhysicsStatus(physics); - part.ScheduleFullUpdate(); - break; + case (int)ScriptBaseClass.PRIM_MATERIAL: + if (remain < 1) + return; + if (part != null) + { + /* Unhandled at this time - sends "Unhandled" message + will enable when available + byte material = (byte)Convert.ToByte( rules.Data[idx++]); + part.Material = material; + */ + return; + } + break; + case (int)ScriptBaseClass.PRIM_PHANTOM: + if (remain < 1) + return; + + string ph = rules.Data[idx++].ToString(); + bool phantom; + + if (ph.Equals("1")) + phantom = true; + else + phantom = false; + + part.ScriptSetPhantomStatus(phantom); + part.ScheduleFullUpdate(); + break; + case (int)ScriptBaseClass.PRIM_PHYSICS: + if (remain < 1) + return; + string phy = rules.Data[idx++].ToString(); + bool physics; + + if (phy.Equals("1")) + physics = true; + else + physics = false; + + m_host.ScriptSetPhysicsStatus(physics); + part.ScheduleFullUpdate(); + break; } } }