From 4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 6 Oct 2011 23:20:51 -0700
Subject: Fixed line endings from previous commit

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 94 ++++++++++++------------
 1 file changed, 47 insertions(+), 47 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e7ef377..213f51d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1075,10 +1075,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void StopFlying()
         {
             ControllingClient.StopFlying(this);
-        }
-
-        // neighbouring regions we have enabled a child agent in
-        // holds the seed cap for the child agent in that region
+        }
+
+        // neighbouring regions we have enabled a child agent in
+        // holds the seed cap for the child agent in that region
         private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>();
 
         public void AddNeighbourRegion(ulong regionHandle, string cap)
@@ -1095,12 +1095,12 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public void RemoveNeighbourRegion(ulong regionHandle)
-        {
+        {
             lock (m_knownChildRegions)
             {
                 // Checking ContainsKey is redundant as Remove works either way and returns a bool
-                // This is here to allow the Debug output to be conditional on removal
-                //if (m_knownChildRegions.ContainsKey(regionHandle))
+                // This is here to allow the Debug output to be conditional on removal
+                //if (m_knownChildRegions.ContainsKey(regionHandle))
                 //    m_log.DebugFormat(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count);
                 m_knownChildRegions.Remove(regionHandle);
             }
@@ -1113,39 +1113,39 @@ namespace OpenSim.Region.Framework.Scenes
                 RemoveNeighbourRegion(handle);
                 Scene.CapsModule.DropChildSeed(UUID, handle);
             }
-        }
-
-        public Dictionary<ulong, string> KnownRegions
-        {
-            get
-            {
-                lock (m_knownChildRegions)
-                    return new Dictionary<ulong, string>(m_knownChildRegions);
-            }
-            set
-            {
-                // Replacing the reference is atomic but we still need to lock on
-                // the original dictionary object which may be in use elsewhere
-                lock (m_knownChildRegions)
-                    m_knownChildRegions = value;
-            }
-        }
-
-        public List<ulong> KnownRegionHandles
-        {
-            get
-            {
-                return new List<ulong>(KnownRegions.Keys);
-            }
-        }
-
-        public int KnownRegionCount
-        {
-            get
-            {
-                lock (m_knownChildRegions)
-                    return m_knownChildRegions.Count;
-            }
+        }
+
+        public Dictionary<ulong, string> KnownRegions
+        {
+            get
+            {
+                lock (m_knownChildRegions)
+                    return new Dictionary<ulong, string>(m_knownChildRegions);
+            }
+            set
+            {
+                // Replacing the reference is atomic but we still need to lock on
+                // the original dictionary object which may be in use elsewhere
+                lock (m_knownChildRegions)
+                    m_knownChildRegions = value;
+            }
+        }
+
+        public List<ulong> KnownRegionHandles
+        {
+            get
+            {
+                return new List<ulong>(KnownRegions.Keys);
+            }
+        }
+
+        public int KnownRegionCount
+        {
+            get
+            {
+                lock (m_knownChildRegions)
+                    return m_knownChildRegions.Count;
+            }
         }
 
         #endregion
@@ -2986,13 +2986,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public void CloseChildAgents(uint newRegionX, uint newRegionY)
         {
-            List<ulong> byebyeRegions = new List<ulong>();
+            List<ulong> byebyeRegions = new List<ulong>();
             List<ulong> knownRegions = KnownRegionHandles;
             m_log.DebugFormat(
                 "[SCENE PRESENCE]: Closing child agents. Checking {0} regions in {1}", 
                 knownRegions.Count, Scene.RegionInfo.RegionName);
-            //DumpKnownRegions();
-
+            //DumpKnownRegions();
+
             foreach (ulong handle in knownRegions)
             {
                 // Don't close the agent on this region yet
@@ -3434,10 +3434,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void Close()
         {
             if (!IsChildAgent)
-                m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false);
-
-            // Clear known regions
-            KnownRegions = new Dictionary<ulong, string>();
+                m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false);
+
+            // Clear known regions
+            KnownRegions = new Dictionary<ulong, string>();
 
             lock (m_reprioritization_timer)
             {
-- 
cgit v1.1