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

minor changes

avinationmerge
UbitUmarov 2015-08-31 04:37:52 +01:00
parent 0edffae7e4
commit c24f3b4f5e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -200,8 +200,8 @@ namespace OpenSim.Region.CoreModules.World.Land
EntityBase presenceEntity; EntityBase presenceEntity;
if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
{ {
SendParcelOverlay(client);
SendLandUpdate((ScenePresence)presenceEntity, true); SendLandUpdate((ScenePresence)presenceEntity, true);
SendParcelOverlay(client);
} }
*/ */
} }
@ -396,18 +396,18 @@ namespace OpenSim.Region.CoreModules.World.Land
if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar)) if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar))
return; return;
SendParcelOverlay(remoteClient);
if (avatar.IsChildAgent) if (!avatar.IsChildAgent)
return; {
ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
ILandObject over = GetLandObject(avatar.AbsolutePosition.X,avatar.AbsolutePosition.Y);
if (over == null) if (over == null)
return; return;
avatar.currentParcelUUID = over.LandData.GlobalID; avatar.currentParcelUUID = over.LandData.GlobalID;
over.SendLandUpdateToClient(avatar.ControllingClient); over.SendLandUpdateToClient(avatar.ControllingClient);
} }
SendParcelOverlay(remoteClient);
}
public void SendLandUpdate(ScenePresence avatar, bool force) public void SendLandUpdate(ScenePresence avatar, bool force)
{ {
@ -977,9 +977,9 @@ namespace OpenSim.Region.CoreModules.World.Land
//Now add the new land object //Now add the new land object
ILandObject result = AddLandObject(newLand); ILandObject result = AddLandObject(newLand);
UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData); UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
m_scene.ForEachClient(SendParcelOverlay);
result.SendLandUpdateToAvatarsOverMe(); result.SendLandUpdateToAvatarsOverMe();
startLandObject.SendLandUpdateToAvatarsOverMe(); startLandObject.SendLandUpdateToAvatarsOverMe();
m_scene.ForEachClient(SendParcelOverlay);
} }
/// <summary> /// <summary>
@ -1043,8 +1043,8 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
m_scene.ForEachClient(SendParcelOverlay);
masterLandObject.SendLandUpdateToAvatarsOverMe(); masterLandObject.SendLandUpdateToAvatarsOverMe();
m_scene.ForEachClient(SendParcelOverlay);
} }
public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
@ -1105,12 +1105,12 @@ namespace OpenSim.Region.CoreModules.World.Land
//Sale type //Sale type
tempByte = (byte)LandChannel.LAND_TYPE_IS_FOR_SALE; tempByte = (byte)LandChannel.LAND_TYPE_IS_FOR_SALE;
} }
else if(currentParcelBlock.LandData.OwnerID == UUID.Zero) else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
{ {
//Public type //Public type
tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
} }
// LAND_TYPE_IS_BEING_AUCTIONED still unsuported // LAND_TYPE_IS_BEING_AUCTIONED still unsuported
else else
{ {
//Other Flag //Other Flag
@ -1169,6 +1169,12 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
} }
}
if (byteArrayCount > 0)
{
remote_client.SendLandParcelOverlay(byteArray, sequenceID);
} }
} }