diff options
| author | UbitUmarov | 2014-07-22 16:28:30 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-22 16:28:30 +0100 |
| commit | f394fabfc0a7ff4b81a238f6aaf965514419cea4 (patch) | |
| tree | 5b6bd883bcb1dd19da686bb297b432b73080bc3b /OpenSim | |
| parent | CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so (diff) | |
| download | opensim-SC-f394fabfc0a7ff4b81a238f6aaf965514419cea4.zip opensim-SC-f394fabfc0a7ff4b81a238f6aaf965514419cea4.tar.gz opensim-SC-f394fabfc0a7ff4b81a238f6aaf965514419cea4.tar.bz2 opensim-SC-f394fabfc0a7ff4b81a238f6aaf965514419cea4.tar.xz | |
if sited avatar cross fails, dont add it to physics and dont mess scripts
(?)
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 5fea0cf..037f143 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1677,7 +1677,10 @@ 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 | |||
| 1682 | if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0) | ||
| 1683 | return false; | ||
| 1681 | 1684 | ||
| 1682 | ReInstantiateScripts(agent); | 1685 | ReInstantiateScripts(agent); |
| 1683 | agent.AddToPhysicalScene(isFlying); | 1686 | agent.AddToPhysicalScene(isFlying); |