aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-09 22:05:00 +0000
committerTeravus Ovares2008-02-09 22:05:00 +0000
commitd2e66872ed38375e91b0fe16951bcb50e72f0e66 (patch)
tree62f83e302d914b957320971a80457816cfa2f079 /OpenSim
parent* added count of texture data bytes and asset bytes (diff)
downloadopensim-SC-d2e66872ed38375e91b0fe16951bcb50e72f0e66.zip
opensim-SC-d2e66872ed38375e91b0fe16951bcb50e72f0e66.tar.gz
opensim-SC-d2e66872ed38375e91b0fe16951bcb50e72f0e66.tar.bz2
opensim-SC-d2e66872ed38375e91b0fe16951bcb50e72f0e66.tar.xz
*Neb try this update. It might fix it.. it might also cause no parcel to be sent.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index dd13fc0..a4d8868 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -727,15 +727,21 @@ namespace OpenSim.Region.Environment.LandManagement
727 { 727 {
728 if (force) 728 if (force)
729 { 729 {
730 over.sendLandUpdateToClient(avatar.ControllingClient); 730 if (!avatar.IsChildAgent)
731 {
732 over.sendLandUpdateToClient(avatar.ControllingClient);
733 }
731 } 734 }
732 735
733 if (avatar.currentParcelUUID != over.landData.globalID) 736 if (avatar.currentParcelUUID != over.landData.globalID)
734 { 737 {
735 over.sendLandUpdateToClient(avatar.ControllingClient); 738 if (!avatar.IsChildAgent)
736 avatar.currentParcelUUID = over.landData.globalID; 739 {
737 m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID, 740 over.sendLandUpdateToClient(avatar.ControllingClient);
738 m_scene.RegionInfo.RegionID); 741 avatar.currentParcelUUID = over.landData.globalID;
742 m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID,
743 m_scene.RegionInfo.RegionID);
744 }
739 } 745 }
740 } 746 }
741 } 747 }