Merge branch 'master' into presence-refactor

This brings presence-refactor up to master again

2 files changed, 33 insertions, 33 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a421484..dc4249c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8192,38 +8192,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false))
-                {
-                        if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
-                        {
-                                lock (m_host.TaskInventory)
-                                {
-                                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
-                                        {
-                                                if (inv.Value.Name == item)
-                                                {
-                                                        switch (mask)
-                                                        {
-                                                                case 0:
-                                                                        inv.Value.BasePermissions = (uint)value;
-                                                                        break;
-                                                                case 1:
-                                                                        inv.Value.CurrentPermissions = (uint)value;
-                                                                        break;
-                                                                case 2:
-                                                                        inv.Value.GroupPermissions = (uint)value;
-                                                                        break;
-                                                                case 3:
-                                                                        inv.Value.EveryonePermissions = (uint)value;
-                                                                        break;
-                                                                case 4:
-                                                                        inv.Value.NextPermissions = (uint)value;
-                                                                        break;
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                }
+            {
+                if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
+                {
+                    lock (m_host.TaskInventory)
+                    {
+                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        {
+                            if (inv.Value.Name == item)
+                            {
+                                switch (mask)
+                                {
+                                    case 0:
+                                        inv.Value.BasePermissions = (uint)value;
+                                        break;
+                                    case 1:
+                                        inv.Value.CurrentPermissions = (uint)value;
+                                        break;
+                                    case 2:
+                                        inv.Value.GroupPermissions = (uint)value;
+                                        break;
+                                    case 3:
+                                        inv.Value.EveryonePermissions = (uint)value;
+                                        break;
+                                    case 4:
+                                        inv.Value.NextPermissions = (uint)value;
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         public LSL_String llGetInventoryCreator(string item)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c552b92..98e77c0 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -841,7 +841,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
                 if (handlerObjectRemoved != null)
                 {
-                    SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);                    
+                    SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
                     handlerObjectRemoved(part.UUID);
                 }