Remove the bandaid (fast rip)

0.6.1-post-fixes
Melanie Thielker 2008-12-03 03:26:58 +00:00
parent 0edb533c27
commit b80a48841e
2 changed files with 19 additions and 19 deletions

View File

@ -170,16 +170,16 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
agent.child = false; agent.child = false;
m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent);
//if (eq != null) if (eq != null)
//{ {
// OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint); OSD Item = EventQueueHelper.EnableSimulator(realHandle, reg.ExternalEndPoint);
// eq.Enqueue(Item, avatar.UUID); eq.Enqueue(Item, avatar.UUID);
//} }
//else else
//{ {
// avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint); avatar.ControllingClient.InformClientOfNeighbour(realHandle, reg.ExternalEndPoint);
// // TODO: make Event Queue disablable! // TODO: make Event Queue disablable!
//} }
m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
position, false); position, false);

View File

@ -683,15 +683,15 @@ namespace OpenSim.Region.Environment.Scenes
agent.child = false; agent.child = false;
m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent);
//if (eq != null) if (eq != null)
//{ {
// OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint); OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, reg.ExternalEndPoint);
// eq.Enqueue(Item, avatar.UUID); eq.Enqueue(Item, avatar.UUID);
//} }
//else else
//{ {
// avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint); avatar.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, reg.ExternalEndPoint);
//} }
m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
position, false); position, false);