diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 112 |
1 files changed, 62 insertions, 50 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 98ba8c3..bfab7b8 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -62,8 +62,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
62 | 62 | ||
63 | public class LandManagementModule : INonSharedRegionModule | 63 | public class LandManagementModule : INonSharedRegionModule |
64 | { | 64 | { |
65 | private static readonly ILog m_log = | 65 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
66 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
67 | 66 | ||
68 | private static readonly string remoteParcelRequestPath = "0009/"; | 67 | private static readonly string remoteParcelRequestPath = "0009/"; |
69 | 68 | ||
@@ -72,6 +71,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
72 | protected Commander m_commander = new Commander("land"); | 71 | protected Commander m_commander = new Commander("land"); |
73 | 72 | ||
74 | protected IUserManagement m_userManager; | 73 | protected IUserManagement m_userManager; |
74 | protected IPrimCountModule m_primCountModule; | ||
75 | 75 | ||
76 | // Minimum for parcels to work is 64m even if we don't actually use them. | 76 | // Minimum for parcels to work is 64m even if we don't actually use them. |
77 | #pragma warning disable 0429 | 77 | #pragma warning disable 0429 |
@@ -88,7 +88,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
88 | /// </value> | 88 | /// </value> |
89 | private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>(); | 89 | private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>(); |
90 | 90 | ||
91 | private bool m_landPrimCountTainted; | ||
92 | private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; | 91 | private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; |
93 | 92 | ||
94 | private bool m_allowedForcefulBans = true; | 93 | private bool m_allowedForcefulBans = true; |
@@ -121,18 +120,18 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
121 | 120 | ||
122 | m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd; | 121 | m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd; |
123 | m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate; | 122 | m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate; |
123 | m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene; | ||
124 | m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate; | ||
125 | |||
124 | m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel; | 126 | m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel; |
125 | m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement; | 127 | m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement; |
126 | m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy; | 128 | m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy; |
127 | m_scene.EventManager.OnLandBuy += EventManagerOnLandBuy; | 129 | m_scene.EventManager.OnLandBuy += EventManagerOnLandBuy; |
128 | m_scene.EventManager.OnNewClient += EventManagerOnNewClient; | 130 | m_scene.EventManager.OnNewClient += EventManagerOnNewClient; |
129 | m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement; | 131 | m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement; |
130 | m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene; | ||
131 | m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage; | 132 | m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage; |
132 | m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage; | 133 | m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage; |
133 | m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan; | 134 | m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan; |
134 | m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate; | ||
135 | m_scene.EventManager.OnParcelPrimCountTainted += EventManagerOnParcelPrimCountTainted; | ||
136 | m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps; | 135 | m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps; |
137 | m_scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole; | 136 | m_scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole; |
138 | 137 | ||
@@ -147,6 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
147 | public void RegionLoaded(Scene scene) | 146 | public void RegionLoaded(Scene scene) |
148 | { | 147 | { |
149 | m_userManager = m_scene.RequestModuleInterface<IUserManagement>(); | 148 | m_userManager = m_scene.RequestModuleInterface<IUserManagement>(); |
149 | m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>(); | ||
150 | } | 150 | } |
151 | 151 | ||
152 | public void RemoveRegion(Scene scene) | 152 | public void RemoveRegion(Scene scene) |
@@ -306,10 +306,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
306 | /// <returns>The parcel created.</returns> | 306 | /// <returns>The parcel created.</returns> |
307 | protected ILandObject CreateDefaultParcel() | 307 | protected ILandObject CreateDefaultParcel() |
308 | { | 308 | { |
309 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); | 309 | m_log.DebugFormat( |
310 | "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName); | ||
311 | |||
312 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); | ||
310 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); | 313 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); |
311 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 314 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
312 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); | 315 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); |
316 | |||
313 | return AddLandObject(fullSimParcel); | 317 | return AddLandObject(fullSimParcel); |
314 | } | 318 | } |
315 | 319 | ||
@@ -579,7 +583,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
579 | } | 583 | } |
580 | else | 584 | else |
581 | { | 585 | { |
582 | m_log.WarnFormat("[LAND]: Invalid local land ID {0}", landLocalID); | 586 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Invalid local land ID {0}", landLocalID); |
583 | } | 587 | } |
584 | } | 588 | } |
585 | 589 | ||
@@ -590,6 +594,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
590 | public ILandObject AddLandObject(ILandObject land) | 594 | public ILandObject AddLandObject(ILandObject land) |
591 | { | 595 | { |
592 | ILandObject new_land = land.Copy(); | 596 | ILandObject new_land = land.Copy(); |
597 | |||
598 | // Only now can we add the prim counts to the land object - we rely on the global ID which is generated | ||
599 | // as a random UUID inside LandData initialization | ||
600 | if (m_primCountModule != null) | ||
601 | new_land.PrimCounts = m_primCountModule.GetPrimCounts(new_land.LandData.GlobalID); | ||
593 | 602 | ||
594 | lock (m_landList) | 603 | lock (m_landList) |
595 | { | 604 | { |
@@ -603,6 +612,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
603 | { | 612 | { |
604 | if (landBitmap[x, y]) | 613 | if (landBitmap[x, y]) |
605 | { | 614 | { |
615 | // m_log.DebugFormat( | ||
616 | // "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", | ||
617 | // new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName); | ||
618 | |||
606 | m_landIDList[x, y] = newLandLocalID; | 619 | m_landIDList[x, y] = newLandLocalID; |
607 | } | 620 | } |
608 | } | 621 | } |
@@ -630,7 +643,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
630 | { | 643 | { |
631 | if (m_landIDList[x, y] == local_id) | 644 | if (m_landIDList[x, y] == local_id) |
632 | { | 645 | { |
633 | m_log.WarnFormat("[LAND]: Not removing land object {0}; still being used at {1}, {2}", | 646 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Not removing land object {0}; still being used at {1}, {2}", |
634 | local_id, x, y); | 647 | local_id, x, y); |
635 | return; | 648 | return; |
636 | //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y); | 649 | //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y); |
@@ -732,8 +745,16 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
732 | // Corner case. If an autoreturn happens during sim startup | 745 | // Corner case. If an autoreturn happens during sim startup |
733 | // we will come here with the list uninitialized | 746 | // we will come here with the list uninitialized |
734 | // | 747 | // |
748 | int landId = m_landIDList[x, y]; | ||
749 | |||
750 | // if (landId == 0) | ||
751 | // m_log.DebugFormat( | ||
752 | // "[LAND MANAGEMENT MODULE]: No land object found at ({0}, {1}) on {2}", | ||
753 | // x, y, m_scene.RegionInfo.RegionName); | ||
754 | |||
735 | if (m_landList.ContainsKey(m_landIDList[x, y])) | 755 | if (m_landList.ContainsKey(m_landIDList[x, y])) |
736 | return m_landList[m_landIDList[x, y]]; | 756 | return m_landList[m_landIDList[x, y]]; |
757 | |||
737 | return null; | 758 | return null; |
738 | } | 759 | } |
739 | } | 760 | } |
@@ -751,13 +772,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
751 | { | 772 | { |
752 | try | 773 | try |
753 | { | 774 | { |
754 | //if (m_landList.ContainsKey(m_landIDList[x / 4, y / 4])) | 775 | return m_landList[m_landIDList[x / 4, y / 4]]; |
755 | return m_landList[m_landIDList[x / 4, y / 4]]; | ||
756 | //else | ||
757 | // return null; | ||
758 | } | 776 | } |
759 | catch (IndexOutOfRangeException) | 777 | catch (IndexOutOfRangeException) |
760 | { | 778 | { |
779 | // m_log.WarnFormat( | ||
780 | // "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", | ||
781 | // x, y, m_scene.RegionInfo.RegionName); | ||
782 | |||
761 | return null; | 783 | return null; |
762 | } | 784 | } |
763 | } | 785 | } |
@@ -767,34 +789,24 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
767 | 789 | ||
768 | #region Parcel Modification | 790 | #region Parcel Modification |
769 | 791 | ||
770 | public void ResetAllLandPrimCounts() | 792 | public void ResetOverMeRecords() |
771 | { | 793 | { |
772 | lock (m_landList) | 794 | lock (m_landList) |
773 | { | 795 | { |
774 | foreach (LandObject p in m_landList.Values) | 796 | foreach (LandObject p in m_landList.Values) |
775 | { | 797 | { |
776 | p.ResetLandPrimCounts(); | 798 | p.ResetOverMeRecord(); |
777 | } | 799 | } |
778 | } | 800 | } |
779 | } | 801 | } |
780 | 802 | ||
781 | public void EventManagerOnParcelPrimCountTainted() | ||
782 | { | ||
783 | m_landPrimCountTainted = true; | ||
784 | } | ||
785 | |||
786 | public bool IsLandPrimCountTainted() | ||
787 | { | ||
788 | return m_landPrimCountTainted; | ||
789 | } | ||
790 | |||
791 | public void EventManagerOnParcelPrimCountAdd(SceneObjectGroup obj) | 803 | public void EventManagerOnParcelPrimCountAdd(SceneObjectGroup obj) |
792 | { | 804 | { |
793 | Vector3 position = obj.AbsolutePosition; | 805 | Vector3 position = obj.AbsolutePosition; |
794 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); | 806 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); |
795 | if (landUnderPrim != null) | 807 | if (landUnderPrim != null) |
796 | { | 808 | { |
797 | landUnderPrim.AddPrimToCount(obj); | 809 | ((LandObject)landUnderPrim).AddPrimOverMe(obj); |
798 | } | 810 | } |
799 | } | 811 | } |
800 | 812 | ||
@@ -804,7 +816,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
804 | { | 816 | { |
805 | foreach (LandObject p in m_landList.Values) | 817 | foreach (LandObject p in m_landList.Values) |
806 | { | 818 | { |
807 | p.RemovePrimFromCount(obj); | 819 | p.RemovePrimFromOverMe(obj); |
808 | } | 820 | } |
809 | } | 821 | } |
810 | } | 822 | } |
@@ -837,8 +849,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
837 | foreach (LandObject p in landOwnersAndParcels[owner]) | 849 | foreach (LandObject p in landOwnersAndParcels[owner]) |
838 | { | 850 | { |
839 | simArea += p.LandData.Area; | 851 | simArea += p.LandData.Area; |
840 | simPrims += p.LandData.OwnerPrims + p.LandData.OtherPrims + p.LandData.GroupPrims + | 852 | simPrims += p.PrimCounts.Total; |
841 | p.LandData.SelectedPrims; | ||
842 | } | 853 | } |
843 | 854 | ||
844 | foreach (LandObject p in landOwnersAndParcels[owner]) | 855 | foreach (LandObject p in landOwnersAndParcels[owner]) |
@@ -851,7 +862,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
851 | 862 | ||
852 | public void EventManagerOnParcelPrimCountUpdate() | 863 | public void EventManagerOnParcelPrimCountUpdate() |
853 | { | 864 | { |
854 | ResetAllLandPrimCounts(); | 865 | // m_log.DebugFormat( |
866 | // "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", | ||
867 | // m_scene.RegionInfo.RegionName); | ||
868 | |||
869 | ResetOverMeRecords(); | ||
855 | EntityBase[] entities = m_scene.Entities.GetEntities(); | 870 | EntityBase[] entities = m_scene.Entities.GetEntities(); |
856 | foreach (EntityBase obj in entities) | 871 | foreach (EntityBase obj in entities) |
857 | { | 872 | { |
@@ -864,15 +879,13 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
864 | } | 879 | } |
865 | } | 880 | } |
866 | FinalizeLandPrimCountUpdate(); | 881 | FinalizeLandPrimCountUpdate(); |
867 | m_landPrimCountTainted = false; | ||
868 | } | 882 | } |
869 | 883 | ||
870 | public void EventManagerOnRequestParcelPrimCountUpdate() | 884 | public void EventManagerOnRequestParcelPrimCountUpdate() |
871 | { | 885 | { |
872 | ResetAllLandPrimCounts(); | 886 | ResetOverMeRecords(); |
873 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); | 887 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); |
874 | FinalizeLandPrimCountUpdate(); | 888 | FinalizeLandPrimCountUpdate(); |
875 | m_landPrimCountTainted = false; | ||
876 | } | 889 | } |
877 | 890 | ||
878 | /// <summary> | 891 | /// <summary> |
@@ -936,8 +949,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
936 | m_landList[startLandObjectIndex].ForceUpdateLandInfo(); | 949 | m_landList[startLandObjectIndex].ForceUpdateLandInfo(); |
937 | } | 950 | } |
938 | 951 | ||
939 | EventManagerOnParcelPrimCountTainted(); | ||
940 | |||
941 | //Now add the new land object | 952 | //Now add the new land object |
942 | ILandObject result = AddLandObject(newLand); | 953 | ILandObject result = AddLandObject(newLand); |
943 | UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData); | 954 | UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData); |
@@ -1004,7 +1015,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1004 | performFinalLandJoin(masterLandObject, slaveLandObject); | 1015 | performFinalLandJoin(masterLandObject, slaveLandObject); |
1005 | } | 1016 | } |
1006 | } | 1017 | } |
1007 | EventManagerOnParcelPrimCountTainted(); | ||
1008 | 1018 | ||
1009 | masterLandObject.SendLandUpdateToAvatarsOverMe(); | 1019 | masterLandObject.SendLandUpdateToAvatarsOverMe(); |
1010 | } | 1020 | } |
@@ -1194,11 +1204,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1194 | 1204 | ||
1195 | if (land != null) | 1205 | if (land != null) |
1196 | { | 1206 | { |
1207 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); | ||
1197 | m_landList[local_id].SendLandObjectOwners(remote_client); | 1208 | m_landList[local_id].SendLandObjectOwners(remote_client); |
1198 | } | 1209 | } |
1199 | else | 1210 | else |
1200 | { | 1211 | { |
1201 | m_log.WarnFormat("[PARCEL]: Invalid land object {0} passed for parcel object owner request", local_id); | 1212 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Invalid land object {0} passed for parcel object owner request", local_id); |
1202 | } | 1213 | } |
1203 | } | 1214 | } |
1204 | 1215 | ||
@@ -1361,7 +1372,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1361 | { | 1372 | { |
1362 | ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene); | 1373 | ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene); |
1363 | new_land.LandData = data.Copy(); | 1374 | new_land.LandData = data.Copy(); |
1364 | new_land.SetLandBitmapFromByteArray(); | 1375 | new_land.SetLandBitmapFromByteArray(); |
1365 | AddLandObject(new_land); | 1376 | AddLandObject(new_land); |
1366 | } | 1377 | } |
1367 | 1378 | ||
@@ -1425,8 +1436,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1425 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) | 1436 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) |
1426 | { | 1437 | { |
1427 | IClientAPI client; | 1438 | IClientAPI client; |
1428 | if (! m_scene.TryGetClient(agentID, out client)) { | 1439 | if (!m_scene.TryGetClient(agentID, out client)) |
1429 | m_log.WarnFormat("[LAND] unable to retrieve IClientAPI for {0}", agentID.ToString()); | 1440 | { |
1441 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID); | ||
1430 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); | 1442 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); |
1431 | } | 1443 | } |
1432 | 1444 | ||
@@ -1475,7 +1487,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1475 | } | 1487 | } |
1476 | else | 1488 | else |
1477 | { | 1489 | { |
1478 | m_log.WarnFormat("[LAND] unable to find parcelID {0}", parcelID); | 1490 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to find parcelID {0}", parcelID); |
1479 | } | 1491 | } |
1480 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); | 1492 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); |
1481 | } | 1493 | } |
@@ -1533,17 +1545,17 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1533 | } | 1545 | } |
1534 | catch (LLSD.LLSDParseException e) | 1546 | catch (LLSD.LLSDParseException e) |
1535 | { | 1547 | { |
1536 | m_log.ErrorFormat("[LAND] Fetch error: {0}", e.Message); | 1548 | m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Fetch error: {0}", e.Message); |
1537 | m_log.ErrorFormat("[LAND] ... in request {0}", request); | 1549 | m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: ... in request {0}", request); |
1538 | } | 1550 | } |
1539 | catch(InvalidCastException) | 1551 | catch (InvalidCastException) |
1540 | { | 1552 | { |
1541 | m_log.ErrorFormat("[LAND] Wrong type in request {0}", request); | 1553 | m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Wrong type in request {0}", request); |
1542 | } | 1554 | } |
1543 | 1555 | ||
1544 | LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse(); | 1556 | LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse(); |
1545 | response.parcel_id = parcelID; | 1557 | response.parcel_id = parcelID; |
1546 | m_log.DebugFormat("[LAND] got parcelID {0}", parcelID); | 1558 | m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID); |
1547 | 1559 | ||
1548 | return LLSDHelpers.SerialiseLLSDReply(response); | 1560 | return LLSDHelpers.SerialiseLLSDReply(response); |
1549 | } | 1561 | } |
@@ -1564,7 +1576,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1564 | ExtendedLandData extLandData = new ExtendedLandData(); | 1576 | ExtendedLandData extLandData = new ExtendedLandData(); |
1565 | Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle, | 1577 | Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle, |
1566 | out extLandData.X, out extLandData.Y); | 1578 | out extLandData.X, out extLandData.Y); |
1567 | m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}", | 1579 | m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelinfo request for regionHandle {0}, x/y {1}/{2}", |
1568 | extLandData.RegionHandle, extLandData.X, extLandData.Y); | 1580 | extLandData.RegionHandle, extLandData.X, extLandData.Y); |
1569 | 1581 | ||
1570 | // for this region or for somewhere else? | 1582 | // for this region or for somewhere else? |
@@ -1605,7 +1617,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1605 | info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); | 1617 | info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); |
1606 | } | 1618 | } |
1607 | // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. | 1619 | // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. |
1608 | m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...", | 1620 | m_log.DebugFormat("[LAND MANAGEMENT MODULE]: got parcelinfo for parcel {0} in region {1}; sending...", |
1609 | data.LandData.Name, data.RegionHandle); | 1621 | data.LandData.Name, data.RegionHandle); |
1610 | // HACK for now | 1622 | // HACK for now |
1611 | RegionInfo r = new RegionInfo(); | 1623 | RegionInfo r = new RegionInfo(); |
@@ -1616,7 +1628,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1616 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); | 1628 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); |
1617 | } | 1629 | } |
1618 | else | 1630 | else |
1619 | m_log.Debug("[LAND] got no parcelinfo; not sending"); | 1631 | m_log.Debug("[LAND MANAGEMENT MODULE]: got no parcelinfo; not sending"); |
1620 | } | 1632 | } |
1621 | 1633 | ||
1622 | public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime) | 1634 | public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime) |