ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the bandaid (fast rip)

Browse Source
This commit is contained in:
Melanie Thielker
2008-12-03 03:26:58 +00:00
parent 0edb533c27
commit b80a48841e
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

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

18
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

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