* Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up

OpenSim/Data/MySQL/MySQLEstateData.cs

@@ -447,24 +447,30 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
+                try
+                {
                     using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
                         cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
                         cmd.Parameters.AddWithValue("?RegionID", regionID);
                         cmd.Parameters.AddWithValue("?EstateID", estateID);
 
-                    if (cmd.ExecuteNonQuery() == 0)
+                        int ret = cmd.ExecuteNonQuery();
+                        dbcon.Close();
+
+                        return (ret != 0);
+                    }
+                }
+                catch (MySqlException ex)
                 {
+                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
+                }
+
                 dbcon.Close();
+            }
+
             return false;
         }
-                }
-
-                dbcon.Close();
-            }
-
-            return true;
-        }
 
         public List<UUID> GetRegions(int estateID)
         {