ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixes an issue with the BaseHttpServer in Linux

Browse Source 
* Fixes an estate naming issue
* Fixes a land issue with the landobject not reporting the proper parcel prim.
* A few other tweaks.
This commit is contained in:
Teravus Ovares
2008-04-15 06:21:44 +00:00
parent 00dbca468a
commit 682f4e9257
7 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Framework/EstateSettings.cs
View File

@@ -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;

1
OpenSim/Framework/LandData.cs
View File

@@ -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 |

9
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -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
}
}
}