aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-12-23 14:25:22 +0000
committerUbitUmarov2016-12-23 14:25:22 +0000
commit70475c676bbb9ed3a029a5c28c8e253e7df35d97 (patch)
tree7c0f000d3bb07028a1a3459c9901a31d5250017b /OpenSim/Region
parent check if a parcelID is a encoded position data or a true UUID. This may fail... (diff)
downloadopensim-SC-70475c676bbb9ed3a029a5c28c8e253e7df35d97.zip
opensim-SC-70475c676bbb9ed3a029a5c28c8e253e7df35d97.tar.gz
opensim-SC-70475c676bbb9ed3a029a5c28c8e253e7df35d97.tar.bz2
opensim-SC-70475c676bbb9ed3a029a5c28c8e253e7df35d97.tar.xz
dont try to use a parcelID as encoded position when it is not
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index bec5322..22bc49e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1880,8 +1880,9 @@ namespace OpenSim.Region.CoreModules.World.Land
1880 UUID.TryParse(id, out parcel); 1880 UUID.TryParse(id, out parcel);
1881 // assume we've got the parcelID we just computed in RemoteParcelRequest 1881 // assume we've got the parcelID we just computed in RemoteParcelRequest
1882 ExtendedLandData extLandData = new ExtendedLandData(); 1882 ExtendedLandData extLandData = new ExtendedLandData();
1883 Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle, 1883 if(!Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
1884 out extLandData.X, out extLandData.Y); 1884 out extLandData.X, out extLandData.Y))
1885 return null;
1885 m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelinfo request for regionHandle {0}, x/y {1}/{2}", 1886 m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
1886 extLandData.RegionHandle, extLandData.X, extLandData.Y); 1887 extLandData.RegionHandle, extLandData.X, extLandData.Y);
1887 1888