Added exception handler to LandManager IncomingLandObjectFromStorage

1 files changed, 13 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 3bd8848..bdb50cc 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -119,10 +119,21 @@ namespace OpenSim.Region.Environment.LandManagement
 
         public void IncomingLandObjectsFromStorage(List<LandData> data)
         {
-            foreach (LandData parcel in data)
+            for (int i = 0; i < data.Count; i++)
             {
-                IncomingLandObjectFromStorage(parcel);
+                try
+                {
+                    IncomingLandObjectFromStorage(data[i]);
+                }
+                catch (Exception ex)
+                {
+                    MainLog.Instance.Verbose("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString() );
+                }
             }
+            //foreach (LandData parcel in data)
+            //{
+            //    IncomingLandObjectFromStorage(parcel);
+            //}
         }
 
         public void IncomingLandObjectFromStorage(LandData data)