5 files changed, 109 insertions, 109 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 9bf6728..40650f3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -730,11 +730,11 @@ namespace OpenSim.Region.Environment.Scenes
 
                         if (item != null)
                         {
-                                                        group.AddInventoryItem(remoteClient, primLocalID, item, copyID);
-                                                        m_log.InfoFormat(
-                                                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 
-                                                                item.Name, primLocalID, remoteClient.Name);
-                                                        group.GetProperties(remoteClient);
+                            group.AddInventoryItem(remoteClient, primLocalID, item, copyID);
+                            m_log.InfoFormat(
+                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 
+                                item.Name, primLocalID, remoteClient.Name);
+                            group.GetProperties(remoteClient);
                         }
                         else
                         {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 8fdb468..5e0b8ba 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -134,10 +134,10 @@ namespace OpenSim.Region.Environment.Scenes
             EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(
                agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated);
 
-                        // First, allow all validators a stab at it
+            // First, allow all validators a stab at it
             m_eventManager.TriggerValidateLandBuy(this, args);        
 
-                        // Then, check validation and transfer
+            // Then, check validation and transfer
             m_eventManager.TriggerLandBuy(this, args);        
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 6e815a6..dd361bf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -258,32 +258,32 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-                // Assumes a lock is held on the inventory
-                private bool InventoryContainsName(string name)
-                {
-                        foreach (TaskInventoryItem item in m_taskInventory.Values)
-                        {
-                                if(item.Name == name)
-                                        return true;
-                        }
-                        return false;
-                }
-
-                private string FindAvailableInventoryName(string name)
-                {
-                        if(!InventoryContainsName(name))
-                                return name;
-
-                        int suffix=1;
-                        while(suffix < 256)
-                        {
-                                string tryName=String.Format("{0} {1}", name, suffix);
-                                if(!InventoryContainsName(tryName))
-                                        return tryName;
-                                suffix++;
-                        }
-                        return String.Empty;
-                }
+        // Assumes a lock is held on the inventory
+        private bool InventoryContainsName(string name)
+        {
+            foreach (TaskInventoryItem item in m_taskInventory.Values)
+            {
+                if(item.Name == name)
+                    return true;
+            }
+            return false;
+        }
+
+        private string FindAvailableInventoryName(string name)
+        {
+            if(!InventoryContainsName(name))
+                return name;
+
+            int suffix=1;
+            while(suffix < 256)
+            {
+                string tryName=String.Format("{0} {1}", name, suffix);
+                if(!InventoryContainsName(tryName))
+                    return tryName;
+                suffix++;
+            }
+            return String.Empty;
+        }
 
         /// <summary>
         /// Add an item to this prim's inventory.
@@ -295,11 +295,11 @@ namespace OpenSim.Region.Environment.Scenes
             item.CreationDate = 1000;
             item.ParentPartID = UUID;
 
-                        string name=FindAvailableInventoryName(item.Name);
-                        if(name == String.Empty)
-                                return;
+            string name=FindAvailableInventoryName(item.Name);
+            if(name == String.Empty)
+                return;
 
-                        item.Name=name;
+            item.Name=name;
 
             lock (m_taskInventory)
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 099d0f0..0608fa7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Scenes
         public uint Category;
         
         // TODO: This needs to be persisted in next XML version update!
-                [XmlIgnore] public int[] PayPrice = {0,0,0,0,0};
+        [XmlIgnore] public int[] PayPrice = {0,0,0,0,0};
 
 
         [XmlIgnore] public bool m_IsAttachment = false;
@@ -2038,18 +2038,18 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
 
-                        if(soundID == LLUUID.Zero)
-                                return;
+            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
-                                        continue;
+                double dis=Util.GetDistanceTo(p.AbsolutePosition, position);
+                if(dis > 100.0) // Max audio distance
+                    continue;
 
-                                // Scale by distance
-                                volume*=((100.0-dis)/100.0);
+                // Scale by distance
+                volume*=((100.0-dis)/100.0);
 
                 if (triggered)
                 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3f70108..94dbbb3 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
                 m_pos = value;
-                                m_parentPosition=new LLVector3(0, 0, 0);
+                m_parentPosition=new LLVector3(0, 0, 0);
             }
         }
 
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Environment.Scenes
             // Move them into an object to (hopefully) avoid threading issues.
             try
             {
-                                SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
+                SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
             }
             catch (KeyNotFoundException)
             {
@@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AddToPhysicalScene();
             m_physicsActor.Flying = isFlying;
-                        SendAnimPack();
+            SendAnimPack();
 
             m_scene.SwapRootAgentCount(false);
             m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);
@@ -570,15 +570,15 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void MakeChildAgent()
         {
-                        if(m_animations.Count > 0)
-                        {
-                                LLUUID movement=m_animations[0];
+            if(m_animations.Count > 0)
+            {
+                LLUUID movement=m_animations[0];
 
-                                m_animations.Clear();
-                                m_animationSeqs.Clear();
+                m_animations.Clear();
+                m_animationSeqs.Clear();
 
-                                SetMovementAnimation(movement);
-                        }
+                SetMovementAnimation(movement);
+            }
 //            m_log.DebugFormat(
 //                 "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", 
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
@@ -611,10 +611,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="pos"></param>
         public void Teleport(LLVector3 pos)
         {
-                        RemoveFromPhysicalScene();
-                        Velocity = new LLVector3(0, 0, 0);
+            RemoveFromPhysicalScene();
+            Velocity = new LLVector3(0, 0, 0);
             AbsolutePosition = pos;
-                        AddToPhysicalScene();
+            AddToPhysicalScene();
             SendTerseUpdateToAllClients();
         }
 
@@ -1055,12 +1055,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void AddAnimation(LLUUID animID)
         {
-                        if(m_isChildAgent)
-                                return;
+            if(m_isChildAgent)
+                return;
 
-                        // Don't let this animation become the movement animation
-                        if(m_animations.Count < 1)
-                                SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
+            // Don't let this animation become the movement animation
+            if(m_animations.Count < 1)
+                SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
 
             if (!m_animations.Contains(animID))
             {
@@ -1072,8 +1072,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void RemoveAnimation(LLUUID animID)
         {
-                        if(m_isChildAgent)
-                                return;
+            if(m_isChildAgent)
+                return;
 
             if (m_animations.Contains(animID))
             {
@@ -1083,21 +1083,21 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 {
-                                        // What a HACK!! Anim list really needs to be an object!
-                                        int idx;
-
-                                        for(idx=0;idx < m_animations.Count;idx++)
-                                        {
-                                                if(m_animations[idx] == animID)
-                                                {
-                                                        int seq=m_animationSeqs[idx];
-
-                                                        m_animations.Remove(animID);
-                                                        m_animationSeqs.Remove(seq);
-                                                        SendAnimPack();
-                                                        break;
-                                                }
-                                        }
+                    // What a HACK!! Anim list really needs to be an object!
+                    int idx;
+
+                    for(idx=0;idx < m_animations.Count;idx++)
+                    {
+                        if(m_animations[idx] == animID)
+                        {
+                            int seq=m_animationSeqs[idx];
+
+                            m_animations.Remove(animID);
+                            m_animationSeqs.Remove(seq);
+                            SendAnimPack();
+                            break;
+                        }
+                    }
                 }
             }
         }
@@ -1119,33 +1119,33 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         protected void SetMovementAnimation(LLUUID anim)
         {
-                        if(m_animations.Count < 1)
-                        {
-                                m_animations.Add(Animations.AnimsLLUUID["STAND"]);
-                                m_animationSeqs.Add(1);
-
-                                SendAnimPack();
-                        }
-                        else
-                        {
-                                try
-                                {
-                                        if (m_animations[0] != anim)
-                                        {
-                                                m_animations[0] = anim;
-                                                m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
-                                        }
-                                        SendAnimPack();
-                                }
-                                catch
-                                {
-                                        m_log.Warn("[AVATAR]: SetMovementAnimation for avatar failed. Attempting recovery...");
-                                        m_animations[0] = anim;
-                                        m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
-                                        SendAnimPack();
-                                }
-                        }
-                }
+            if(m_animations.Count < 1)
+            {
+                m_animations.Add(Animations.AnimsLLUUID["STAND"]);
+                m_animationSeqs.Add(1);
+
+                SendAnimPack();
+            }
+            else
+            {
+                try
+                {
+                    if (m_animations[0] != anim)
+                    {
+                        m_animations[0] = anim;
+                        m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
+                    }
+                    SendAnimPack();
+                }
+                catch
+                {
+                    m_log.Warn("[AVATAR]: SetMovementAnimation for avatar failed. Attempting recovery...");
+                    m_animations[0] = anim;
+                    m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
+                    SendAnimPack();
+                }
+            }
+        }
 
         /// <summary>
         /// This method handles agent movement related animations
@@ -1536,8 +1536,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="seqs"></param>
         public void SendAnimPack(LLUUID[] animations, int[] seqs)
         {
-                        if(m_isChildAgent)
-                                return;
+            if(m_isChildAgent)
+                return;
 
             m_scene.Broadcast(
                 delegate(IClientAPI client) { client.SendAnimations(animations, seqs, m_controllingClient.AgentId); });