Formatting cleanup.

6 files changed, 59 insertions, 61 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 8541024..3e250da 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             }
             sceneObject.UpdateParentIDs();
-            
+
             AddSceneObject(sceneObject);
         }
 
@@ -215,14 +215,14 @@ namespace OpenSim.Region.Environment.Scenes
                     //  QuadTree.AddSceneObject(sceneObject);
                     Entities.Add(sceneObject.UUID, sceneObject);
                     m_numPrim++;
-                    
+
                     return true;
                 }
-                
+
                 return false;
             }
         }
-        
+
         /// <summary>
         /// Delete an object from the scene
         /// </summary>
@@ -236,11 +236,11 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     Entities.Remove(uuid);
                     m_numPrim--;
-                    
+
                     return true;
                 }
             }
-            
+
             return false;
         }
 
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             m_activeScripts += number;
         }
-        
+
         protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient)
         {
             List<EntityBase> EntityList = GetEntities();
@@ -340,9 +340,9 @@ namespace OpenSim.Region.Environment.Scenes
                 SceneObjectPart part =  m_parentScene.GetSceneObjectPart(primId);
                 if (part != null)
                     part.Undo();
-            }            
+            }
         }
-        
+
         protected internal void HandleObjectGroupUpdate(
             IClientAPI remoteClient, LLUUID GroupID, uint objectLocalID, LLUUID Garbage)
         {
@@ -360,12 +360,11 @@ namespace OpenSim.Region.Environment.Scenes
                             group.SetGroup(GroupID, remoteClient);
                         else
                             remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false);
-                        
                     }
                 }
             }
         }
-        
+
         /// <summary>
         /// Event Handling routine for Attach Object
         /// </summary>
@@ -379,7 +378,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero);
         }
-        
+
         protected internal void RezSingleAttachment(
             IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask)
         {
@@ -492,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes
             newAvatar.IsChildAgent = child;
 
             AddScenePresence(newAvatar);
-            
+
             return newAvatar;
         }
 
@@ -528,7 +527,7 @@ namespace OpenSim.Region.Environment.Scenes
                 ScenePresences[presence.UUID] = presence;
             }
         }
-        
+
         /// <summary>
         /// Remove a presence from the scene
         /// </summary>
@@ -545,9 +544,9 @@ namespace OpenSim.Region.Environment.Scenes
                     m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID);
                 }
             }
-            
+
             lock (ScenePresences)
-            {                
+            {
                 if (ScenePresences.Remove(agentID))
                 {
                     //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
@@ -556,7 +555,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
                 }
-            }          
+            }
         }
 
         protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -622,7 +621,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_scriptLPS = 0;
             return returnval;
         }
-        
+
         #endregion
 
         #region Get Methods
@@ -863,7 +862,6 @@ namespace OpenSim.Region.Environment.Scenes
                             {
                                 break;
                             }
-                            
                         }
                         grp.scriptScore = 0;
                     }
@@ -964,7 +962,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
-        
+
         protected internal void UpdatePrimGroupScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
         {
             SceneObjectGroup group = GetGroupByPrim(localID);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5e7fd98..f5cb0b9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void AddUploadedInventoryItem(LLUUID agentID, InventoryItemBase item)
         {
             IMoneyModule money=RequestModuleInterface<IMoneyModule>();
-            if(money != null)
+            if (money != null)
             {
                 money.ApplyUploadCharge(agentID);
             }
@@ -930,7 +930,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (part != null)
             {
                 TaskInventoryItem currentItem=part.GetInventoryItem(itemID);
-                if(currentItem == null)
+                if (currentItem == null)
                 {
                     LLUUID copyID = LLUUID.Random();
                     if (itemID != LLUUID.Zero)
@@ -972,9 +972,9 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else // Updating existing item with new perms etc
                 {
-                                        TaskInventoryItem prevItem=part.GetInventoryItem(itemID);
-                                        itemInfo.AssetID = prevItem.AssetID;
-                    if(part.UpdateInventoryItem(itemInfo))
+                    TaskInventoryItem prevItem=part.GetInventoryItem(itemID);
+                    itemInfo.AssetID = prevItem.AssetID;
+                    if (part.UpdateInventoryItem(itemInfo))
                         part.GetProperties(remoteClient);
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 41bd2d3..f5fe561 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -63,9 +63,9 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (broadcast)
                 EventManager.TriggerOnChatBroadcast(this, args);
-            else 
+            else
                 EventManager.TriggerOnChatFromWorld(this, args);
-            
+
         }
         /// <summary>
         ///
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
                 LLUUID itemID)
         {
             SceneObjectPart part=GetSceneObjectPart(objectID);
-            if(part == null)
+            if (part == null)
                 return;
             EventManager.TriggerScriptReset(part.LocalId, itemID);
         }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c9f23af..1be0617 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -199,9 +199,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// The dictionary of all entities in this scene.  The contents of this dictionary may be changed at any time.
         /// If you wish to add or remove entities, please use the appropriate method for that entity rather than
-        /// editing this dictionary directly. 
-        /// 
-        /// If you want a list of entities where the list itself is guaranteed not to change, please use 
+        /// editing this dictionary directly.
+        ///
+        /// If you want a list of entities where the list itself is guaranteed not to change, please use
         /// GetEntities()
         /// </summary>
         public Dictionary<LLUUID, EntityBase> Entities
@@ -565,19 +565,19 @@ namespace OpenSim.Region.Environment.Scenes
                 m_scripts_enabled = !ScriptEngine;
                 m_log.Info("[TOTEDD]: Here is the method to trigger disabling of the scripting engine");
             }
-            
+
             if (m_physics_enabled != !PhysicsEngine)
             {
                 m_physics_enabled = !PhysicsEngine;
             }
         }
-        
+
         public int GetInaccurateNeighborCount()
         {
             lock (m_neighbours)
                 return m_neighbours.Count;
         }
-        
+
         // This is the method that shuts down the scene.
         public override void Close()
         {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a4ca33d..4610c99 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2100,26 +2100,26 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="pos"></param>
         public void UpdateOffSet(LLVector3 pos)
         {
-                        if ((pos.X != OffsetPosition.X) ||
-                            (pos.Y != OffsetPosition.Y) ||
-                            (pos.Z != OffsetPosition.Z))
-                        {
-                    LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
-                    OffsetPosition = newPos;
-                    ScheduleTerseUpdate();
-                        }
+            if ((pos.X != OffsetPosition.X) ||
+                (pos.Y != OffsetPosition.Y) ||
+                (pos.Z != OffsetPosition.Z))
+            {
+                LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
+                OffsetPosition = newPos;
+                ScheduleTerseUpdate();
+            }
         }
 
         public void UpdateGroupPosition(LLVector3 pos)
         {
-                        if ((pos.X != GroupPosition.X) ||
-                            (pos.Y != GroupPosition.Y) ||
-                            (pos.Z != GroupPosition.Z))
-                        {
-                    LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
-                    GroupPosition = newPos;
-                    ScheduleTerseUpdate();
-                        }
+            if ((pos.X != GroupPosition.X) ||
+                (pos.Y != GroupPosition.Y) ||
+                (pos.Z != GroupPosition.Z))
+            {
+                LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z);
+                GroupPosition = newPos;
+                ScheduleTerseUpdate();
+            }
         }
 
         #endregion
@@ -2128,15 +2128,15 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void UpdateRotation(LLQuaternion rot)
         {
-                        if ((rot.X != RotationOffset.X) ||
-                            (rot.Y != RotationOffset.Y) ||
-                            (rot.Z != RotationOffset.Z) ||
-                            (rot.W != RotationOffset.W))
-                        {
-                    //StoreUndoState();
-                    RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W);
-                    ScheduleTerseUpdate();
-                        }
+            if ((rot.X != RotationOffset.X) ||
+                (rot.Y != RotationOffset.Y) ||
+                (rot.Z != RotationOffset.Z) ||
+                (rot.W != RotationOffset.W))
+            {
+                //StoreUndoState();
+                RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W);
+                ScheduleTerseUpdate();
+            }
         }
 
         #endregion
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 396d752..dfefe24 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1407,9 +1407,9 @@ namespace OpenSim.Region.Environment.Scenes
             if (remoteAvatar == null)
                 return;
             IClientAPI cl=remoteAvatar.ControllingClient;
-            if(cl == null)
+            if (cl == null)
                 return;
-            if(m_appearance.Texture == null)
+            if (m_appearance.Texture == null)
                 return;
 
             remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,