From f9701dcbd7c331cff1d4418e38d0ca0be1851723 Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Mon, 1 Dec 2008 21:13:24 +0000 Subject: [PATCH] Adds check/warning for GetParcelLocalID method if ParcelMap/Dictionary has not been previously populated git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2367 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/ParcelManager.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/OpenMetaverse/ParcelManager.cs b/OpenMetaverse/ParcelManager.cs index 61f5b128..ce54d999 100644 --- a/OpenMetaverse/ParcelManager.cs +++ b/OpenMetaverse/ParcelManager.cs @@ -202,6 +202,7 @@ namespace OpenMetaverse /// /// Some information about a parcel of land returned from a DirectoryManager search /// + [Serializable] public struct ParcelInfo { /// Global Key of record @@ -1169,7 +1170,15 @@ namespace OpenMetaverse /// dictionary. public int GetParcelLocalID(Simulator simulator, Vector3 position) { - return simulator.ParcelMap[(byte)position.Y / 4, (byte)position.X / 4]; + if (simulator.ParcelMap[(byte)position.Y / 4, (byte)position.X / 4] > 0) + { + return simulator.ParcelMap[(byte)position.Y / 4, (byte)position.X / 4]; + } + else + { + Logger.Log(String.Format("ParcelMap returned an default/invalid value for location {0}/{1} Did you use RequestAllSimParcels() to populate the dictionaries?", (byte)position.Y / 4, (byte)position.X / 4 ), Helpers.LogLevel.Warning); + return 0; + } } ///