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

* Move code from that last commit to LLClientView since it's a linden client specific limitation, it moves to the Linden Specific client handler.

mysql-performance
Teravus Ovares (Dan Olivares) 2009-12-03 02:02:04 -05:00
parent af04cd1ae0
commit d9a20edfb0
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -5521,6 +5521,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId)
{
// Linden Client limitation..
if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.X == 255.5f
|| avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y == 255.5f)
{
ScenePresence avatar = null;
if (((Scene)m_scene).TryGetAvatar(AgentId, out avatar))
{
if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.X == 255.5f)
{
avSetStartLocationRequestPacket.StartLocationData.LocationPos.X = avatar.AbsolutePosition.X;
}
if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y == 255.5f)
{
avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y = avatar.AbsolutePosition.Y;
}
}
}
TeleportLocationRequest handlerSetStartLocationRequest = OnSetStartLocationRequest;
if (handlerSetStartLocationRequest != null)
{

18
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3034,24 +3034,6 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: The next line can be removed, as soon as only homeRegionID based UserServers are around.
// TODO: The HomeRegion property can be removed then, too
UserProfile.HomeRegion = RegionInfo.RegionHandle;
// Linden Client limitation..
if (position.X == 255.5f || position.Y == 255.5f)
{
ScenePresence avatar = null;
if (TryGetAvatar(remoteClient.AgentId, out avatar))
{
if (position.X == 255.5f)
{
position.X = avatar.AbsolutePosition.X;
}
if (position.Y == 255.5f)
{
position.Y = avatar.AbsolutePosition.Y;
}
}
}
UserProfile.HomeLocation = position;
UserProfile.HomeLookAt = lookAt;