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

Apply Diva's bandaid to OpenSim's scraped knee.

0.6.1-post-fixes
Melanie Thielker 2008-12-03 01:55:40 +00:00
parent d253008450
commit 0edb533c27
2 changed files with 19 additions and 19 deletions
Show Stats 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; 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);

18
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
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);