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

do not send parceloverlay on crossings (may be bad, or not)

0.9.1.0-post-fixes
UbitUmarov 2019-03-19 06:38:43 +00:00
parent 1c6be0fae3
commit 182977a872
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/ILandChannel.cs
View File

@ -98,6 +98,6 @@ namespace OpenSim.Region.Framework.Interfaces
void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id); void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id); void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
void sendClientInitialLandInfo(IClientAPI remoteClient); void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true);
} }
} }

4
OpenSim/Region/CoreModules/World/Land/LandChannel.cs
View File

@ -247,11 +247,11 @@ namespace OpenSim.Region.CoreModules.World.Land
m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime); m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime);
} }
} }
public void sendClientInitialLandInfo(IClientAPI remoteClient) public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true)
{ {
if (m_landManagementModule != null) if (m_landManagementModule != null)
{ {
m_landManagementModule.sendClientInitialLandInfo(remoteClient); m_landManagementModule.sendClientInitialLandInfo(remoteClient, overlay);
} }
} }
#endregion #endregion

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

@ -491,7 +491,7 @@ namespace OpenSim.Region.CoreModules.World.Land
return; return;
} }
public void sendClientInitialLandInfo(IClientAPI remoteClient) public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true)
{ {
ScenePresence avatar; ScenePresence avatar;
@ -507,6 +507,7 @@ namespace OpenSim.Region.CoreModules.World.Land
avatar.currentParcelUUID = over.LandData.GlobalID; avatar.currentParcelUUID = over.LandData.GlobalID;
over.SendLandUpdateToClient(avatar.ControllingClient); over.SendLandUpdateToClient(avatar.ControllingClient);
} }
if(overlay)
SendParcelOverlay(remoteClient); SendParcelOverlay(remoteClient);
} }

5
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2244,11 +2244,12 @@ namespace OpenSim.Region.Framework.Scenes
// start sending terrain patchs // start sending terrain patchs
if (!gotCrossUpdate) if (!gotCrossUpdate)
Scene.SendLayerData(ControllingClient); Scene.SendLayerData(ControllingClient);
}
// send initial land overlay and parcel // send initial land overlay and parcel
ILandChannel landch = m_scene.LandChannel; ILandChannel landch = m_scene.LandChannel;
if (landch != null) if (landch != null)
landch.sendClientInitialLandInfo(client); landch.sendClientInitialLandInfo(client, !gotCrossUpdate);
}
if (!IsChildAgent) if (!IsChildAgent)
{ {

2
OpenSim/Tests/Common/Mock/TestLandChannel.cs
View File

@ -119,6 +119,6 @@ namespace OpenSim.Tests.Common
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) {}
public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
public void sendClientInitialLandInfo(IClientAPI remoteClient) { } public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) { }
} }
} }