Remove the bandaid (fast rip)
parent
0edb533c27
commit
b80a48841e
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue