aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorUbitUmarov2014-07-24 00:30:38 +0100
committerUbitUmarov2014-07-24 00:30:38 +0100
commit46695ddbfec065cdc4a89aec03742782b8ed26d0 (patch)
treea2887dbc6e3c4db82724fad3e58d51ecab9d6f69 /OpenSim/Region/CoreModules/Framework/EntityTransfer
parent on sit use root prim camera at and eye if child as neither (diff)
downloadopensim-SC-46695ddbfec065cdc4a89aec03742782b8ed26d0.zip
opensim-SC-46695ddbfec065cdc4a89aec03742782b8ed26d0.tar.gz
opensim-SC-46695ddbfec065cdc4a89aec03742782b8ed26d0.tar.bz2
opensim-SC-46695ddbfec065cdc4a89aec03742782b8ed26d0.tar.xz
fix line ending
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs8
1 files changed, 4 insertions, 4 deletions
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
51 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")] 51 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")]
52 public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule 52 public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule
53 { 53 {
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 private static readonly string LogHeader = "[ENTITY TRANSFER MODULE]"; 55 private static readonly string LogHeader = "[ENTITY TRANSFER MODULE]";
56 56
57 public const int DefaultMaxTransferDistance = 4095; 57 public const int DefaultMaxTransferDistance = 4095;
@@ -1677,9 +1677,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1677 1677
1678 m_log.WarnFormat( 1678 m_log.WarnFormat(
1679 "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", 1679 "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.",
1680 neighbourRegion.RegionName, agent.Name); 1680 neighbourRegion.RegionName, agent.Name);
1681 1681
1682 if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0) 1682 if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)
1683 return false; 1683 return false;
1684 1684
1685 ReInstantiateScripts(agent); 1685 ReInstantiateScripts(agent);