aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-03-19 06:52:57 +0000
committerUbitUmarov2019-03-19 06:52:57 +0000
commitb10a3ba0232031a1daac2a972478b7c34b7ec7ff (patch)
treef48f99eeb408128d437d8e678985e134c66fc482
parentdo not send parceloverlay on crossings (may be bad, or not) (diff)
downloadopensim-SC-b10a3ba0232031a1daac2a972478b7c34b7ec7ff.zip
opensim-SC-b10a3ba0232031a1daac2a972478b7c34b7ec7ff.tar.gz
opensim-SC-b10a3ba0232031a1daac2a972478b7c34b7ec7ff.tar.bz2
opensim-SC-b10a3ba0232031a1daac2a972478b7c34b7ec7ff.tar.xz
take the deafult on the parameter overlay
-rw-r--r--OpenSim/Framework/ILandChannel.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandChannel.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestLandChannel.cs2
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 0efd908..6f4a07a 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -98,6 +98,6 @@ namespace OpenSim.Region.Framework.Interfaces
98 98
99 void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id); 99 void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
100 void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id); 100 void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
101 void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true); 101 void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay);
102 } 102 }
103} 103}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index eaa5292..9e687eb 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.World.Land
247 m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime); 247 m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime);
248 } 248 }
249 } 249 }
250 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) 250 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay)
251 { 251 {
252 if (m_landManagementModule != null) 252 if (m_landManagementModule != null)
253 { 253 {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index c7b45ef..b67cad7 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -491,7 +491,7 @@ namespace OpenSim.Region.CoreModules.World.Land
491 return; 491 return;
492 } 492 }
493 493
494 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) 494 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay)
495 { 495 {
496 ScenePresence avatar; 496 ScenePresence avatar;
497 497
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a67d701..f010035 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4040,7 +4040,7 @@ namespace OpenSim.Region.Framework.Scenes
4040 ILandChannel landch = m_scene.LandChannel; 4040 ILandChannel landch = m_scene.LandChannel;
4041 if (landch != null) 4041 if (landch != null)
4042 { 4042 {
4043 landch.sendClientInitialLandInfo(ControllingClient); 4043 landch.sendClientInitialLandInfo(ControllingClient, true);
4044 } 4044 }
4045 } 4045 }
4046 4046
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 87cbede..b5227aa 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -119,6 +119,6 @@ namespace OpenSim.Tests.Common
119 119
120 public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} 120 public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
121 public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} 121 public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
122 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay = true) { } 122 public void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay) { }
123 } 123 }
124} \ No newline at end of file 124} \ No newline at end of file