aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs18
-rw-r--r--OpenSim/Framework/LandData.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs9
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
486 } 486 }
487 } 487 }
488 488
489 // Estate name
490 private string m_estateName;
491
492 public string estateName
493 {
494 get { return m_estateName; }
495 set
496 {
497 m_estateName = value;
498 configMember.forceSetConfigurationOption("estate_name", m_estateName.ToString());
499 }
500 }
501
489 private LLUUID m_estateManager0; 502 private LLUUID m_estateManager0;
490 private LLUUID m_estateManager1; 503 private LLUUID m_estateManager1;
491 private LLUUID m_estateManager2; 504 private LLUUID m_estateManager2;
@@ -835,6 +848,8 @@ namespace OpenSim.Framework
835 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 848 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
836 String.Empty, "00000000-0000-0000-0000-000000000000", true); 849 String.Empty, "00000000-0000-0000-0000-000000000000", true);
837 850
851 configMember.addConfigurationOption("estate_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
852 String.Empty, "TestEstate", true);
838 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 853 configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
839 String.Empty, "00000000-0000-0000-0000-000000000000", true); 854 String.Empty, "00000000-0000-0000-0000-000000000000", true);
840 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 855 configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
@@ -966,6 +981,9 @@ namespace OpenSim.Framework
966 case "terrain_file": 981 case "terrain_file":
967 m_terrainFile = (string) configuration_result; 982 m_terrainFile = (string) configuration_result;
968 break; 983 break;
984 case "estate_name":
985 m_estateName = (string) configuration_result;
986 break;
969 case "terrain_multiplier": 987 case "terrain_multiplier":
970 m_terrainMultiplier = Convert.ToDouble(configuration_result); 988 m_terrainMultiplier = Convert.ToDouble(configuration_result);
971 break; 989 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
56 public int salePrice = 0; //Unemeplemented. Parcels price. 56 public int salePrice = 0; //Unemeplemented. Parcels price.
57 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased; 57 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
58 58
59
59 public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 60 public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
60 (uint) Parcel.ParcelFlags.AllowAllObjectEntry | 61 (uint) Parcel.ParcelFlags.AllowAllObjectEntry |
61 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform | 62 (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
332 } 332 }
333 finally 333 finally
334 { 334 {
335 response.OutputStream.Close(); 335 try
336 {
337 response.OutputStream.Close();
338 }
339 catch (System.Net.Sockets.SocketException)
340 {
341 // This has to be here to prevent a Linux/Mono crash
342 }
336 } 343 }
337 } 344 }
338 345