diff options
author | Diva Canto | 2016-06-22 11:52:53 -0700 |
---|---|---|
committer | Diva Canto | 2016-06-22 11:52:53 -0700 |
commit | f8bd3d2f2ee99c69b3196f55d785c178d97109e5 (patch) | |
tree | c87c286731005a9b9703bc7c62451b05ed32817f /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Can't do it do it this low in the stack. Attachments on teleports apparently ... (diff) | |
download | opensim-SC_OLD-f8bd3d2f2ee99c69b3196f55d785c178d97109e5.zip opensim-SC_OLD-f8bd3d2f2ee99c69b3196f55d785c178d97109e5.tar.gz opensim-SC_OLD-f8bd3d2f2ee99c69b3196f55d785c178d97109e5.tar.bz2 opensim-SC_OLD-f8bd3d2f2ee99c69b3196f55d785c178d97109e5.tar.xz |
Mantis #7935: regression on transferring attachments over the HG
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index e5d725c..8beed93 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1491,7 +1491,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1491 | // m_log.DebugFormat( | 1491 | // m_log.DebugFormat( |
1492 | // "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name); | 1492 | // "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name); |
1493 | 1493 | ||
1494 | // Compute world location of the agente position | 1494 | // Compute world location of the agent's position |
1495 | double presenceWorldX = (double)scene.RegionInfo.WorldLocX + pos.X; | 1495 | double presenceWorldX = (double)scene.RegionInfo.WorldLocX + pos.X; |
1496 | double presenceWorldY = (double)scene.RegionInfo.WorldLocY + pos.Y; | 1496 | double presenceWorldY = (double)scene.RegionInfo.WorldLocY + pos.Y; |
1497 | 1497 | ||
@@ -2240,7 +2240,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2240 | 2240 | ||
2241 | // needed for current OSG or old grid code | 2241 | // needed for current OSG or old grid code |
2242 | 2242 | ||
2243 | public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) | 2243 | protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) |
2244 | { | 2244 | { |
2245 | // Since we don't know how big the regions could be, we have to search a very large area | 2245 | // Since we don't know how big the regions could be, we have to search a very large area |
2246 | // to find possible regions. | 2246 | // to find possible regions. |
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2253 | // 'pSizeHint' is the size of the source region but since the destination point can be anywhere | 2253 | // 'pSizeHint' is the size of the source region but since the destination point can be anywhere |
2254 | // the size of the target region is unknown thus the search area might have to be very large. | 2254 | // the size of the target region is unknown thus the search area might have to be very large. |
2255 | // Return 'null' if no such region exists. | 2255 | // Return 'null' if no such region exists. |
2256 | public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, | 2256 | protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, |
2257 | double px, double py, uint pSizeHint) | 2257 | double px, double py, uint pSizeHint) |
2258 | { | 2258 | { |
2259 | m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); | 2259 | m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py); |
@@ -2795,8 +2795,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2795 | 2795 | ||
2796 | so.ResumeScripts(); | 2796 | so.ResumeScripts(); |
2797 | 2797 | ||
2798 | if (so.RootPart.KeyframeMotion != null) | 2798 | // AddSceneObject already does this and doing it again messes |
2799 | so.RootPart.KeyframeMotion.UpdateSceneObject(so); | 2799 | //if (so.RootPart.KeyframeMotion != null) |
2800 | // so.RootPart.KeyframeMotion.UpdateSceneObject(so); | ||
2800 | } | 2801 | } |
2801 | 2802 | ||
2802 | return true; | 2803 | return true; |