diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 31abadb1ae..3cfc478d1d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 DropResend(id);
 
-				AddAcks(ref packet);
+                AddAcks(ref packet);
                 QueuePacket(packet, throttlePacketType, id);
 
                 // We want to see that packet arrive if it's reliable
@@ -246,8 +246,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-		private void AddAcks(ref Packet packet)
-		{
+        private void AddAcks(ref Packet packet)
+        {
             // Add acks to outgoing packets
             //
             if (m_PendingAcks.Count > 0)
@@ -268,8 +268,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         break;
                 }
             }
-		}
-		
+        }
+        
         private void QueuePacket(
                 Packet packet, ThrottleOutPacketType throttlePacketType,
                 Object id)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 1a60f45c80..d7fd2c544f 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5320,8 +5320,8 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
 
-			if(m_host.ParentGroup == null)
-				return;
+            if (m_host.ParentGroup == null)
+                return;
 
             SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ed320f8b3b..201308d12c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5118,9 +5118,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules)
         {
             m_host.AddScriptLPS(1);
-			
-			if(m_host.ParentGroup == null)
-				return;
+            
+            if (m_host.ParentGroup == null)
+                return;
 
             SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
 
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
index 0b07b3077c..9547b0b700 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
@@ -684,8 +684,8 @@ default
     {
         integer x = 1;
 
-        if(x) llSay(0, ""Hello"");
-        if(1)
+        if (x) llSay(0, ""Hello"");
+        if (1)
         {
             llSay(0, ""Hi"");
             integer r = 3;
@@ -790,8 +790,8 @@ default
         integer x = 1;
         integer y = 0;
 
-        if(x && y) llSay(0, ""Hello"");
-        if(x || y)
+        if (x && y) llSay(0, ""Hello"");
+        if (x || y)
         {
             llSay(0, ""Hi"");
             integer r = 3;
@@ -983,14 +983,14 @@ default
         integer x = 1;
         integer y = 0;
 
-        for(x = 10; x >= 0; x--)
+        for (x = 10; x >= 0; x--)
         {
             llOwnerSay(""Launch in T minus "" + x);
             IncreaseRocketPower();
         }
 
-        for(x = 0, y = 6; y > 0 && x != y; x++, y--) llOwnerSay(""Hi "" + x + "", "" + y);
-        for(x = 0, y = 6; ! y; x++,y--) llOwnerSay(""Hi "" + x + "", "" + y);
+        for (x = 0, y = 6; y > 0 && x != y; x++, y--) llOwnerSay(""Hi "" + x + "", "" + y);
+        for (x = 0, y = 6; ! y; x++,y--) llOwnerSay(""Hi "" + x + "", "" + y);
     }
 }
 ";