aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2014-08-03 22:38:50 +0100
committerUbitUmarov2014-08-03 22:38:50 +0100
commit0d71a2bb8fe90bfaaae4e62d921dbf94e69064b4 (patch)
tree1cf6e76443747449156d6cfcc629749f6f6e4c15 /OpenSim/Region/CoreModules
parent remove debug msgs at attachments deRez (diff)
downloadopensim-SC_OLD-0d71a2bb8fe90bfaaae4e62d921dbf94e69064b4.zip
opensim-SC_OLD-0d71a2bb8fe90bfaaae4e62d921dbf94e69064b4.tar.gz
opensim-SC_OLD-0d71a2bb8fe90bfaaae4e62d921dbf94e69064b4.tar.bz2
opensim-SC_OLD-0d71a2bb8fe90bfaaae4e62d921dbf94e69064b4.tar.xz
mess update ( hide avatars )
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs20
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index d8e3082..c8555ab 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.World.Land
368 public void SendOutNearestBanLine(IClientAPI client) 368 public void SendOutNearestBanLine(IClientAPI client)
369 { 369 {
370 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 370 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
371 if (sp == null || sp.IsChildAgent) 371 if (sp == null)
372 return; 372 return;
373 373
374 List<ILandObject> checkLandParcels = ParcelsNearPoint(sp.AbsolutePosition); 374 List<ILandObject> checkLandParcels = ParcelsNearPoint(sp.AbsolutePosition);
@@ -394,11 +394,12 @@ namespace OpenSim.Region.CoreModules.World.Land
394 394
395 if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar)) 395 if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar))
396 return; 396 return;
397 if (avatar.IsChildAgent)
398 return;
399 397
400 SendParcelOverlay(remoteClient); 398 SendParcelOverlay(remoteClient);
401 399
400 if (avatar.IsChildAgent)
401 return;
402
402 ILandObject over = GetLandObject(avatar.AbsolutePosition.X,avatar.AbsolutePosition.Y); 403 ILandObject over = GetLandObject(avatar.AbsolutePosition.X,avatar.AbsolutePosition.Y);
403 if (over == null) 404 if (over == null)
404 return; 405 return;
@@ -958,7 +959,7 @@ namespace OpenSim.Region.CoreModules.World.Land
958 UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData); 959 UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
959 m_scene.ForEachClient(SendParcelOverlay); 960 m_scene.ForEachClient(SendParcelOverlay);
960 result.SendLandUpdateToAvatarsOverMe(); 961 result.SendLandUpdateToAvatarsOverMe();
961 962 startLandObject.SendLandUpdateToAvatarsOverMe();
962 } 963 }
963 964
964 /// <summary> 965 /// <summary>
@@ -1047,7 +1048,6 @@ namespace OpenSim.Region.CoreModules.World.Land
1047 /// <param name="remote_client">The object representing the client</param> 1048 /// <param name="remote_client">The object representing the client</param>
1048 public void SendParcelOverlay(IClientAPI remote_client) 1049 public void SendParcelOverlay(IClientAPI remote_client)
1049 { 1050 {
1050
1051 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc) 1051 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
1052 return; 1052 return;
1053 1053
@@ -1198,20 +1198,24 @@ namespace OpenSim.Region.CoreModules.World.Land
1198 bool needOverlay = false; 1198 bool needOverlay = false;
1199 if (land.UpdateLandProperties(args, remote_client, out snap_selection, out needOverlay)) 1199 if (land.UpdateLandProperties(args, remote_client, out snap_selection, out needOverlay))
1200 { 1200 {
1201 //the proprieties to who changed it 1201 //the proprieties to who changed them
1202 1202
1203 land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client); 1203 land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client);
1204 1204
1205 if (needOverlay) 1205 if (needOverlay)
1206 { 1206 {
1207 UUID parcelID = land.LandData.GlobalID; 1207 UUID parcelID = land.LandData.GlobalID;
1208 m_scene.ForEachRootScenePresence(delegate(ScenePresence avatar) 1208 m_scene.ForEachScenePresence(delegate(ScenePresence avatar)
1209 { 1209 {
1210 if (avatar.IsDeleted || avatar.IsChildAgent) 1210 if (avatar.IsDeleted || avatar.isNPC)
1211 return; 1211 return;
1212 1212
1213 IClientAPI client = avatar.ControllingClient; 1213 IClientAPI client = avatar.ControllingClient;
1214 SendParcelOverlay(client); 1214 SendParcelOverlay(client);
1215
1216 if (avatar.IsChildAgent)
1217 return;
1218
1215 ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); 1219 ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
1216 if (aland != null) 1220 if (aland != null)
1217 { 1221 {