From 46695ddbfec065cdc4a89aec03742782b8ed26d0 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 24 Jul 2014 00:30:38 +0100
Subject: fix line ending

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 037f143..d3247d9 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")]
     public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly string LogHeader = "[ENTITY TRANSFER MODULE]";
 
         public const int DefaultMaxTransferDistance = 4095;
@@ -1677,9 +1677,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                     m_log.WarnFormat(
                         "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt.  Returning to original region.", 
-                        neighbourRegion.RegionName, agent.Name);
-
-                    if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)
+                        neighbourRegion.RegionName, agent.Name);
+
+                    if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)
                         return false;
 
                     ReInstantiateScripts(agent);
-- 
cgit v1.1