aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs29
1 files changed, 16 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 98ba8c3..514be4f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -306,6 +306,9 @@ 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// m_log.DebugFormat(
310// "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
311
309 ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); 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;
@@ -579,7 +582,7 @@ namespace OpenSim.Region.CoreModules.World.Land
579 } 582 }
580 else 583 else
581 { 584 {
582 m_log.WarnFormat("[LAND]: Invalid local land ID {0}", landLocalID); 585 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Invalid local land ID {0}", landLocalID);
583 } 586 }
584 } 587 }
585 588
@@ -630,7 +633,7 @@ namespace OpenSim.Region.CoreModules.World.Land
630 { 633 {
631 if (m_landIDList[x, y] == local_id) 634 if (m_landIDList[x, y] == local_id)
632 { 635 {
633 m_log.WarnFormat("[LAND]: Not removing land object {0}; still being used at {1}, {2}", 636 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Not removing land object {0}; still being used at {1}, {2}",
634 local_id, x, y); 637 local_id, x, y);
635 return; 638 return;
636 //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y); 639 //throw new Exception("Could not remove land object. Still being used at " + x + ", " + y);
@@ -1198,7 +1201,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1198 } 1201 }
1199 else 1202 else
1200 { 1203 {
1201 m_log.WarnFormat("[PARCEL]: Invalid land object {0} passed for parcel object owner request", local_id); 1204 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Invalid land object {0} passed for parcel object owner request", local_id);
1202 } 1205 }
1203 } 1206 }
1204 1207
@@ -1426,7 +1429,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1426 { 1429 {
1427 IClientAPI client; 1430 IClientAPI client;
1428 if (! m_scene.TryGetClient(agentID, out client)) { 1431 if (! m_scene.TryGetClient(agentID, out client)) {
1429 m_log.WarnFormat("[LAND] unable to retrieve IClientAPI for {0}", agentID.ToString()); 1432 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID);
1430 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); 1433 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
1431 } 1434 }
1432 1435
@@ -1475,7 +1478,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1475 } 1478 }
1476 else 1479 else
1477 { 1480 {
1478 m_log.WarnFormat("[LAND] unable to find parcelID {0}", parcelID); 1481 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to find parcelID {0}", parcelID);
1479 } 1482 }
1480 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty()); 1483 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
1481 } 1484 }
@@ -1533,17 +1536,17 @@ namespace OpenSim.Region.CoreModules.World.Land
1533 } 1536 }
1534 catch (LLSD.LLSDParseException e) 1537 catch (LLSD.LLSDParseException e)
1535 { 1538 {
1536 m_log.ErrorFormat("[LAND] Fetch error: {0}", e.Message); 1539 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Fetch error: {0}", e.Message);
1537 m_log.ErrorFormat("[LAND] ... in request {0}", request); 1540 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: ... in request {0}", request);
1538 } 1541 }
1539 catch(InvalidCastException) 1542 catch (InvalidCastException)
1540 { 1543 {
1541 m_log.ErrorFormat("[LAND] Wrong type in request {0}", request); 1544 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Wrong type in request {0}", request);
1542 } 1545 }
1543 1546
1544 LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse(); 1547 LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse();
1545 response.parcel_id = parcelID; 1548 response.parcel_id = parcelID;
1546 m_log.DebugFormat("[LAND] got parcelID {0}", parcelID); 1549 m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID);
1547 1550
1548 return LLSDHelpers.SerialiseLLSDReply(response); 1551 return LLSDHelpers.SerialiseLLSDReply(response);
1549 } 1552 }
@@ -1564,7 +1567,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1564 ExtendedLandData extLandData = new ExtendedLandData(); 1567 ExtendedLandData extLandData = new ExtendedLandData();
1565 Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle, 1568 Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
1566 out extLandData.X, out extLandData.Y); 1569 out extLandData.X, out extLandData.Y);
1567 m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}", 1570 m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
1568 extLandData.RegionHandle, extLandData.X, extLandData.Y); 1571 extLandData.RegionHandle, extLandData.X, extLandData.Y);
1569 1572
1570 // for this region or for somewhere else? 1573 // for this region or for somewhere else?
@@ -1605,7 +1608,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1605 info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); 1608 info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
1606 } 1609 }
1607 // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. 1610 // 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...", 1611 m_log.DebugFormat("[LAND MANAGEMENT MODULE]: got parcelinfo for parcel {0} in region {1}; sending...",
1609 data.LandData.Name, data.RegionHandle); 1612 data.LandData.Name, data.RegionHandle);
1610 // HACK for now 1613 // HACK for now
1611 RegionInfo r = new RegionInfo(); 1614 RegionInfo r = new RegionInfo();
@@ -1616,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1616 remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); 1619 remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y);
1617 } 1620 }
1618 else 1621 else
1619 m_log.Debug("[LAND] got no parcelinfo; not sending"); 1622 m_log.Debug("[LAND MANAGEMENT MODULE]: got no parcelinfo; not sending");
1620 } 1623 }
1621 1624
1622 public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime) 1625 public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime)