OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

undo the hack.. its useless

avinationmerge
UbitUmarov 2014-08-18 23:14:04 +01:00
parent d31f361e89
commit ffcc1d7fa2
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1782,10 +1782,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// Unlike a teleport, here we do not wait for the destination region to confirm the receipt. // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
AgentHasMovedAway(agent, true); // this may need the attachments
agent.parcelRegionCross(); agent.parcelRegionCross();
AgentHasMovedAway(agent, true);
agent.MakeChildAgent(); agent.MakeChildAgent();
// FIXME: Possibly this should occur lower down after other commands to close other agents, // FIXME: Possibly this should occur lower down after other commands to close other agents,

9
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1772,15 +1772,6 @@ namespace OpenSim.Region.Framework.Scenes
if (!WaitForUpdateAgent(client)) if (!WaitForUpdateAgent(client))
// The sending region never sent the UpdateAgent data, we have to refuse // The sending region never sent the UpdateAgent data, we have to refuse
return; return;
//HACK part A
// kill in viewers sp.localID that they may still know about
m_log.DebugFormat("[CompleteMovement] send old child kills");
m_scene.SendKillObject(new List<uint> { LocalId });
//HACK part B
// keep using same localID
} }
// Prevent teleporting to an underground location // Prevent teleporting to an underground location