aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs33
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
3 files changed, 18 insertions, 23 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 350990e..ae37790 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
89 { 89 {
90 ((SceneObjectGroup) ent).GetProperties(remoteClient); 90 ((SceneObjectGroup) ent).GetProperties(remoteClient);
91 ((SceneObjectGroup) ent).IsSelected = true; 91 ((SceneObjectGroup) ent).IsSelected = true;
92 LandChannel.setPrimsTainted(); 92 LandChannel.SetPrimsTainted();
93 } 93 }
94 break; 94 break;
95 } 95 }
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
115 if (Permissions.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || Permissions.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID)) 115 if (Permissions.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || Permissions.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID))
116 { 116 {
117 ((SceneObjectGroup) ent).IsSelected = false; 117 ((SceneObjectGroup) ent).IsSelected = false;
118 LandChannel.setPrimsTainted(); 118 LandChannel.SetPrimsTainted();
119 break; 119 break;
120 } 120 }
121 } 121 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a703622..a875051 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -799,9 +799,9 @@ namespace OpenSim.Region.Environment.Scenes
799 { 799 {
800 if (LandChannel != null) 800 if (LandChannel != null)
801 { 801 {
802 if (LandChannel.isLandPrimCountTainted()) 802 if (LandChannel.IsLandPrimCountTainted())
803 { 803 {
804 LandChannel.performParcelPrimCountUpdate(); 804 LandChannel.PerformParcelPrimCountUpdate();
805 } 805 }
806 } 806 }
807 } 807 }
@@ -937,12 +937,12 @@ namespace OpenSim.Region.Environment.Scenes
937 if (dGridSettings["allow_forceful_banlines"] != "TRUE") 937 if (dGridSettings["allow_forceful_banlines"] != "TRUE")
938 { 938 {
939 m_log.Info("[GRID]: Grid is disabling forceful parcel banlists"); 939 m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
940 LandChannel.allowedForcefulBans = false; 940 LandChannel.AllowedForcefulBans = false;
941 } 941 }
942 else 942 else
943 { 943 {
944 m_log.Info("[GRID]: Grid is allowing forceful parcel banlists"); 944 m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
945 LandChannel.allowedForcefulBans = true; 945 LandChannel.AllowedForcefulBans = true;
946 } 946 }
947 } 947 }
948 } 948 }
@@ -1305,9 +1305,9 @@ namespace OpenSim.Region.Environment.Scenes
1305 { 1305 {
1306 if (Entities.ContainsKey(sceneObject.UUID)) 1306 if (Entities.ContainsKey(sceneObject.UUID))
1307 { 1307 {
1308 LandChannel.removePrimFromLandPrimCounts(sceneObject); 1308 LandChannel.RemovePrimFromLandPrimCounts(sceneObject);
1309 Entities.Remove(sceneObject.UUID); 1309 Entities.Remove(sceneObject.UUID);
1310 LandChannel.setPrimsTainted(); 1310 LandChannel.SetPrimsTainted();
1311 m_innerScene.RemoveAPrimCount(); 1311 m_innerScene.RemoveAPrimCount();
1312 } 1312 }
1313 } 1313 }
@@ -1318,7 +1318,7 @@ namespace OpenSim.Region.Environment.Scenes
1318 /// <param name="prim"></param> 1318 /// <param name="prim"></param>
1319 public void AcknowledgeNewPrim(SceneObjectGroup prim) 1319 public void AcknowledgeNewPrim(SceneObjectGroup prim)
1320 { 1320 {
1321 prim.OnPrimCountTainted += LandChannel.setPrimsTainted; 1321 prim.OnPrimCountTainted += LandChannel.SetPrimsTainted;
1322 } 1322 }
1323 1323
1324 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) 1324 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
@@ -1525,7 +1525,7 @@ namespace OpenSim.Region.Environment.Scenes
1525 1525
1526 CreateAndAddScenePresence(client, child); 1526 CreateAndAddScenePresence(client, child);
1527 1527
1528 LandChannel.sendParcelOverlay(client); 1528 LandChannel.SendParcelOverlay(client);
1529 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 1529 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
1530 } 1530 }
1531 } 1531 }
@@ -1741,11 +1741,6 @@ namespace OpenSim.Region.Environment.Scenes
1741 1741
1742 ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); 1742 ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
1743 1743
1744 if (avatar.IsChildAgent)
1745 {
1746 avatar.OnSignificantClientMovement += LandChannel.handleSignificantClientMovement;
1747 }
1748
1749 return avatar; 1744 return avatar;
1750 } 1745 }
1751 1746
@@ -1984,7 +1979,7 @@ namespace OpenSim.Region.Environment.Scenes
1984 AddCapsHandler(agent.AgentID); 1979 AddCapsHandler(agent.AgentID);
1985 1980
1986 // Honor parcel landing type and position. 1981 // Honor parcel landing type and position.
1987 ILandObject land = LandChannel.getLandObject(agent.startpos.X, agent.startpos.Y); 1982 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
1988 if (land != null) 1983 if (land != null)
1989 { 1984 {
1990 if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero) 1985 if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero)
@@ -2803,7 +2798,7 @@ namespace OpenSim.Region.Environment.Scenes
2803 2798
2804 public LLUUID GetLandOwner(float x, float y) 2799 public LLUUID GetLandOwner(float x, float y)
2805 { 2800 {
2806 ILandObject land = LandChannel.getLandObject(x, y); 2801 ILandObject land = LandChannel.GetLandObject(x, y);
2807 if (land == null) 2802 if (land == null)
2808 { 2803 {
2809 return LLUUID.Zero; 2804 return LLUUID.Zero;
@@ -2816,12 +2811,12 @@ namespace OpenSim.Region.Environment.Scenes
2816 2811
2817 public LandData GetLandData(float x, float y) 2812 public LandData GetLandData(float x, float y)
2818 { 2813 {
2819 return LandChannel.getLandObject(x, y).landData; 2814 return LandChannel.GetLandObject(x, y).landData;
2820 } 2815 }
2821 2816
2822 public void SetLandMusicURL(float x, float y, string url) 2817 public void SetLandMusicURL(float x, float y, string url)
2823 { 2818 {
2824 ILandObject land = LandChannel.getLandObject(x, y); 2819 ILandObject land = LandChannel.GetLandObject(x, y);
2825 if (land == null) 2820 if (land == null)
2826 { 2821 {
2827 return; 2822 return;
@@ -2835,7 +2830,7 @@ namespace OpenSim.Region.Environment.Scenes
2835 2830
2836 public void SetLandMediaURL(float x, float y, string url) 2831 public void SetLandMediaURL(float x, float y, string url)
2837 { 2832 {
2838 ILandObject land = LandChannel.getLandObject(x, y); 2833 ILandObject land = LandChannel.GetLandObject(x, y);
2839 2834
2840 if (land == null) 2835 if (land == null)
2841 { 2836 {
@@ -2885,7 +2880,7 @@ namespace OpenSim.Region.Environment.Scenes
2885 2880
2886 private bool scriptDanger(SceneObjectPart part,LLVector3 pos) 2881 private bool scriptDanger(SceneObjectPart part,LLVector3 pos)
2887 { 2882 {
2888 ILandObject parcel = LandChannel.getLandObject(pos.X, pos.Y); 2883 ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
2889 if (part != null) 2884 if (part != null)
2890 { 2885 {
2891 if (parcel != null) 2886 if (parcel != null)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2e6fe3d..66363b7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Environment.Scenes
414 RegisterToEvents(); 414 RegisterToEvents();
415 SetDirectionVectors(); 415 SetDirectionVectors();
416 416
417 m_scene.LandChannel.sendLandUpdate(this, true); 417 m_scene.LandChannel.SendLandUpdate(this, true);
418 } 418 }
419 419
420 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, 420 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
@@ -597,7 +597,7 @@ namespace OpenSim.Region.Environment.Scenes
597 //if (!m_gotAllObjectsInScene) 597 //if (!m_gotAllObjectsInScene)
598 //{ 598 //{
599 m_scene.SendAllSceneObjectsToClient(this); 599 m_scene.SendAllSceneObjectsToClient(this);
600 m_scene.LandChannel.sendLandUpdate(this, true); 600 m_scene.LandChannel.SendLandUpdate(this, true);
601 601
602 //m_gotAllObjectsInScene = true; 602 //m_gotAllObjectsInScene = true;
603 //} 603 //}