Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

1 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 100b55c..e1c0949 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         
         protected Scene m_scene = null;
         
-        public string Name { get { return "Attachments Module"; } }        
-        public Type ReplaceableInterface { get { return null; } }        
+        public string Name { get { return "Attachments Module"; } }
+        public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
         
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory;
             client.OnObjectAttach += AttachObject;
             client.OnObjectDetach += DetachObject;
-            client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory;             
+            client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory;
         }
         
         public void UnsubscribeFromClientEvents(IClientAPI client)
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory;
             client.OnObjectAttach -= AttachObject;
             client.OnObjectDetach -= DetachObject;
-            client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory;       
+            client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory;
         }
         
         /// <summary>
@@ -174,12 +174,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 UUID itemID = UUID.Zero;
                 if (sp != null)
                 {
-                    foreach(SceneObjectGroup grp in sp.GetAttachments(AttachmentPt))
+                    foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt))
                     {
                         itemID = grp.GetFromItemID();
                         if (itemID != UUID.Zero)
                             DetachSingleAttachmentToInv(itemID, remoteClient);
-                    }                    
+                    }
                 }
 
                 if (group.GetFromItemID() == UUID.Zero)
@@ -232,7 +232,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public UUID RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
-        {                        
+        {
             SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt, doc);
 
             if (updateInventoryStatus)
@@ -248,8 +248,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (null == att)
                 return UUID.Zero;
             else
-                return att.UUID;            
-        }        
+                return att.UUID;
+        }
 
         protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, XmlDocument doc)
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
             
             return null;
-        }        
+        }
         
         public UUID SetAttachmentInventoryStatus(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
@@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             // We can NOT use the dictionries here, as we are looking
             // for an entity by the fromAssetID, which is NOT the prim UUID
-            List<EntityBase> detachEntities = m_scene.GetEntities();
+            EntityBase[] detachEntities = m_scene.GetEntities();
             SceneObjectGroup group;
 
             foreach (EntityBase entity in detachEntities)
@@ -495,7 +495,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             sog.RootPart.IsAttachment = false;
             sog.AbsolutePosition = sog.RootPart.AttachedPos;
             UpdateKnownItem(client, sog, sog.GetFromItemID(), sog.OwnerID);
-            sog.SetAttachmentPoint(attachmentPoint);            
+            sog.SetAttachmentPoint(attachmentPoint);
         }
         
         /// <summary>
@@ -622,7 +622,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // In case it is later dropped again, don't let
             // it get cleaned up
             so.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
-            so.HasGroupChanged = false;            
+            so.HasGroupChanged = false;
         }
     }
 }