diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index adfac05..abc7a3a 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 | ||
@@ -307,8 +306,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
307 | /// <returns>The parcel created.</returns> | 306 | /// <returns>The parcel created.</returns> |
308 | protected ILandObject CreateDefaultParcel() | 307 | protected ILandObject CreateDefaultParcel() |
309 | { | 308 | { |
310 | // m_log.DebugFormat( | 309 | m_log.DebugFormat( |
311 | // "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName); | 310 | "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName); |
312 | 311 | ||
313 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); | 312 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); |
314 | 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)); |
@@ -778,7 +777,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
778 | 777 | ||
779 | #region Parcel Modification | 778 | #region Parcel Modification |
780 | 779 | ||
781 | public void ResetOverMeRecord() | 780 | public void ResetOverMeRecords() |
782 | { | 781 | { |
783 | lock (m_landList) | 782 | lock (m_landList) |
784 | { | 783 | { |
@@ -855,7 +854,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
855 | // "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", | 854 | // "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", |
856 | // m_scene.RegionInfo.RegionName); | 855 | // m_scene.RegionInfo.RegionName); |
857 | 856 | ||
858 | ResetOverMeRecord(); | 857 | ResetOverMeRecords(); |
859 | EntityBase[] entities = m_scene.Entities.GetEntities(); | 858 | EntityBase[] entities = m_scene.Entities.GetEntities(); |
860 | foreach (EntityBase obj in entities) | 859 | foreach (EntityBase obj in entities) |
861 | { | 860 | { |
@@ -872,7 +871,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
872 | 871 | ||
873 | public void EventManagerOnRequestParcelPrimCountUpdate() | 872 | public void EventManagerOnRequestParcelPrimCountUpdate() |
874 | { | 873 | { |
875 | ResetOverMeRecord(); | 874 | ResetOverMeRecords(); |
876 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); | 875 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); |
877 | FinalizeLandPrimCountUpdate(); | 876 | FinalizeLandPrimCountUpdate(); |
878 | } | 877 | } |
@@ -1193,6 +1192,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1193 | 1192 | ||
1194 | if (land != null) | 1193 | if (land != null) |
1195 | { | 1194 | { |
1195 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); | ||
1196 | m_landList[local_id].SendLandObjectOwners(remote_client); | 1196 | m_landList[local_id].SendLandObjectOwners(remote_client); |
1197 | } | 1197 | } |
1198 | else | 1198 | else |
@@ -1424,7 +1424,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1424 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) | 1424 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) |
1425 | { | 1425 | { |
1426 | IClientAPI client; | 1426 | IClientAPI client; |
1427 | if (! m_scene.TryGetClient(agentID, out client)) { | 1427 | if (!m_scene.TryGetClient(agentID, out client)) |
1428 | { | ||
1428 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID); | 1429 | m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID); |
1429 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); | 1430 | return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); |
1430 | } | 1431 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 9803bdf..c4fb11e 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -925,7 +925,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
925 | } | 925 | } |
926 | catch (NullReferenceException) | 926 | catch (NullReferenceException) |
927 | { | 927 | { |
928 | m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel"); | 928 | m_log.Error("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel"); |
929 | } | 929 | } |
930 | try | 930 | try |
931 | { | 931 | { |
@@ -1073,12 +1073,16 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1073 | 1073 | ||
1074 | public void AddPrimOverMe(SceneObjectGroup obj) | 1074 | public void AddPrimOverMe(SceneObjectGroup obj) |
1075 | { | 1075 | { |
1076 | // m_log.DebugFormat("[LAND OBJECT]: Adding scene object {0} {1} over {2}", obj.Name, obj.LocalId, LandData.Name); | ||
1077 | |||
1076 | lock (primsOverMe) | 1078 | lock (primsOverMe) |
1077 | primsOverMe.Add(obj); | 1079 | primsOverMe.Add(obj); |
1078 | } | 1080 | } |
1079 | 1081 | ||
1080 | public void RemovePrimFromOverMe(SceneObjectGroup obj) | 1082 | public void RemovePrimFromOverMe(SceneObjectGroup obj) |
1081 | { | 1083 | { |
1084 | // m_log.DebugFormat("[LAND OBJECT]: Removing scene object {0} {1} from over {2}", obj.Name, obj.LocalId, LandData.Name); | ||
1085 | |||
1082 | lock (primsOverMe) | 1086 | lock (primsOverMe) |
1083 | primsOverMe.Remove(obj); | 1087 | primsOverMe.Remove(obj); |
1084 | } | 1088 | } |