3 files changed, 27 insertions, 1 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f27c1c3..42154e9 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -486,6 +486,19 @@ namespace OpenSim.Framework
             }
         }
 
+        // Estate name
+        private string m_estateName;
+
+        public string estateName
+        {
+            get { return m_estateName; }
+            set
+            {
+                m_estateName = value;
+                configMember.forceSetConfigurationOption("estate_name", m_estateName.ToString());
+            }
+        }
+
         private LLUUID m_estateManager0;
         private LLUUID m_estateManager1;
         private LLUUID m_estateManager2;
@@ -835,6 +848,8 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
                                                 String.Empty, "00000000-0000-0000-0000-000000000000", true);
 
+            configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                String.Empty, "TestEstate", true);
             configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
                                                 String.Empty, "00000000-0000-0000-0000-000000000000", true);
             configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
@@ -966,6 +981,9 @@ namespace OpenSim.Framework
                 case "terrain_file":
                     m_terrainFile = (string) configuration_result;
                     break;
+                case "estate_name":
+                    m_estateName = (string) configuration_result;
+                    break;
                 case "terrain_multiplier":
                     m_terrainMultiplier = Convert.ToDouble(configuration_result);
                     break;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 734f221..f154e5e 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Framework
         public int salePrice = 0; //Unemeplemented. Parcels price.
         public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
 
+
         public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
                                 (uint) Parcel.ParcelFlags.AllowAllObjectEntry |
                                 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform |
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 289b122..0baddb8 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -332,7 +332,14 @@ namespace OpenSim.Framework.Servers
             }
             finally
             {
-                response.OutputStream.Close();
+                try
+                {
+                    response.OutputStream.Close();
+                }
+                catch (System.Net.Sockets.SocketException)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                }
             }
         }