4 files changed, 50 insertions, 56 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index b613bd0..75e9e57 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -237,14 +237,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             // Outside of this method, they should never be added to objectflags!
             // -teravus
 
-                        SceneObjectPart task=m_scene.GetSceneObjectPart(objID);
+            SceneObjectPart task=m_scene.GetSceneObjectPart(objID);
             
             // this shouldn't ever happen..     return no permissions/objectflags.
             if (task == null)
                 return (uint)0;
 
-                        uint objflags = task.GetEffectiveObjectFlags();
-                        LLUUID objectOwner = task.OwnerID;
+            uint objflags = task.GetEffectiveObjectFlags();
+            LLUUID objectOwner = task.OwnerID;
 
 
             // Remove any of the objectFlags that are temporary.  These will get added back if appropriate 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index ae37790..0a4906a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes
                     // Is this prim part of the group
                     if (obj.HasChildPrim(localID))
                     {
-                                                SceneObjectPart part=obj.GetChildPart(localID);
+                        SceneObjectPart part=obj.GetChildPart(localID);
                         if (part != null)
                         {
                             // If the touched prim handles touches, deliver it
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2bc7fd3..033a419 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -186,8 +186,6 @@ namespace OpenSim.Region.Environment.Scenes
                         string.Format("[SCENE OBJECT GROUP]: Object {0} has no root part.", m_uuid));
                 }
 
-                
-
                 return m_rootPart.GroupPosition;
             }
             set
@@ -198,7 +196,6 @@ namespace OpenSim.Region.Environment.Scenes
                     m_scene.CrossPrimGroupIntoNewRegion(val, this);
                 }
 
-
                 lock (m_parts)
                 {
                     foreach (SceneObjectPart part in m_parts.Values)
@@ -969,19 +966,19 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void aggregateScriptEvents()
         {
-                        uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags();
+            uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags();
 
-                        scriptEvents aggregateScriptEvents=0;
+            scriptEvents aggregateScriptEvents=0;
 
             lock (m_parts)
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
-                                        if(part == null)
-                                                continue;
-                                        if(part != RootPart)
-                                                part.ObjectFlags = objectflagupdate;
-                                        aggregateScriptEvents |= part.m_aggregateScriptEvents;
+                    if (part == null)
+                        continue;
+                    if (part != RootPart)
+                        part.ObjectFlags = objectflagupdate;
+                    aggregateScriptEvents |= part.m_aggregateScriptEvents;
                 }
             }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 3252b6c..56821c6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -98,8 +98,8 @@ namespace OpenSim.Region.Environment.Scenes
         
         // TODO: This needs to be persisted in next XML version update!
         [XmlIgnore] public int[] PayPrice = {-2,-2,-2,-2,-2};
-                [XmlIgnore] private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
-                [XmlIgnore] public scriptEvents m_aggregateScriptEvents=0;
+        [XmlIgnore] private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
+        [XmlIgnore] public scriptEvents m_aggregateScriptEvents=0;
         [XmlIgnore] private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
         [XmlIgnore] public bool DIE_AT_EDGE = false;
 
@@ -190,10 +190,10 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_name = value; }
         }
 
-        public scriptEvents ScriptEvents
-                {
-                        get { return m_aggregateScriptEvents; }
-                }
+        public scriptEvents ScriptEvents
+        {
+            get { return m_aggregateScriptEvents; }
+        }
 
         protected LLObject.MaterialType m_material = 0;
 
@@ -211,14 +211,14 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_regionHandle = value; }
         }
 
-                public uint GetEffectiveObjectFlags()
-                {
-                        LLObject.ObjectFlags f=Flags;
-                        if(m_parentGroup == null || m_parentGroup.RootPart == this)
-                                f &= ~(LLObject.ObjectFlags.Touch | LLObject.ObjectFlags.Money);
+        public uint GetEffectiveObjectFlags()
+        {
+            LLObject.ObjectFlags f = Flags;
+            if (m_parentGroup == null || m_parentGroup.RootPart == this)
+                f &= ~(LLObject.ObjectFlags.Touch | LLObject.ObjectFlags.Money);
 
-                        return (uint)Flags | (uint)LocalFlags;
-                }
+            return (uint)Flags | (uint)LocalFlags;
+        }
 
         //unkown if this will be kept, added as a way of removing the group position from the group class
         protected LLVector3 m_groupPosition;
@@ -2158,14 +2158,14 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
 
-            if(soundID == LLUUID.Zero)
+            if (soundID == LLUUID.Zero)
                 return;
 
             List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
             foreach (ScenePresence p in avatarts)
             {
                 double dis=Util.GetDistanceTo(p.AbsolutePosition, position);
-                if(dis > 100.0) // Max audio distance
+                if (dis > 100.0) // Max audio distance
                     continue;
 
                 // Scale by distance
@@ -2623,25 +2623,25 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-                public void SetScriptEvents(LLUUID scriptid, int events)
-                {
-                        scriptEvents oldparts;
-                        lock (m_scriptEvents)
-                        {
-                                if (m_scriptEvents.ContainsKey(scriptid))
-                                {
-                                        oldparts = m_scriptEvents[scriptid];
+        public void SetScriptEvents(LLUUID scriptid, int events)
+        {
+            scriptEvents oldparts;
+            lock (m_scriptEvents)
+            {
+                if (m_scriptEvents.ContainsKey(scriptid))
+                {
+                    oldparts = m_scriptEvents[scriptid];
 
-                                        // remove values from aggregated script events
-                                        m_scriptEvents[scriptid] = (scriptEvents) events;
-                                }
-                                else
-                                {
-                                        m_scriptEvents.Add(scriptid, (scriptEvents) events);
-                                }
-                        }
-                        aggregateScriptEvents();
-                }
+                    // remove values from aggregated script events
+                    m_scriptEvents[scriptid] = (scriptEvents) events;
+                }
+                else
+                {
+                    m_scriptEvents.Add(scriptid, (scriptEvents) events);
+                }
+            }
+            aggregateScriptEvents();
+        }
 
         public void RemoveScriptEvents(LLUUID scriptid)
         {
@@ -2710,16 +2710,15 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
 
-                        LocalFlags=(LLObject.ObjectFlags)objectflagupdate;
+            LocalFlags=(LLObject.ObjectFlags)objectflagupdate;
 
-                        if(m_parentGroup != null && m_parentGroup.RootPart == this)
-                                m_parentGroup.aggregateScriptEvents();
-                        else
-                                ScheduleFullUpdate();
-                }
+            if (m_parentGroup != null && m_parentGroup.RootPart == this)
+                m_parentGroup.aggregateScriptEvents();
+            else
+                ScheduleFullUpdate();
+        }
         public void PhysicsCollision(EventArgs e)
         {
-            
             return;
 
             //
@@ -2733,7 +2732,6 @@ namespace OpenSim.Region.Environment.Scenes
             //{
              //   m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
             //}
-            
         }
 
         public void SetDieAtEdge(bool p)
@@ -2755,5 +2753,4 @@ namespace OpenSim.Region.Environment.Scenes
             return m_parentGroup.RootPart.DIE_AT_EDGE;
         }
     }
-    
 }