diff options
| author | MW | 2007-08-03 11:44:30 +0000 |
|---|---|---|
| committer | MW | 2007-08-03 11:44:30 +0000 |
| commit | dde8aafb8addbb7ae00802c31f27d51456170000 (patch) | |
| tree | 6790b2130113e3c2c10c100dac8f33bcd294ac5e /OpenSim/Framework | |
| parent | *Estate settings are now saved in their own configuration file called estate_... (diff) | |
| download | opensim-SC-dde8aafb8addbb7ae00802c31f27d51456170000.zip opensim-SC-dde8aafb8addbb7ae00802c31f27d51456170000.tar.gz opensim-SC-dde8aafb8addbb7ae00802c31f27d51456170000.tar.bz2 opensim-SC-dde8aafb8addbb7ae00802c31f27d51456170000.tar.xz | |
More work on the AllNewSceneObject* classes.
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs index ac173a9..11594fd 100644 --- a/OpenSim/Framework/General/Types/EstateSettings.cs +++ b/OpenSim/Framework/General/Types/EstateSettings.cs | |||
| @@ -560,7 +560,6 @@ namespace OpenSim.Framework.Types | |||
| 560 | 560 | ||
| 561 | public void loadConfigurationOptions() | 561 | public void loadConfigurationOptions() |
| 562 | { | 562 | { |
| 563 | |||
| 564 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true); | 563 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true); |
| 565 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "","0",true); | 564 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "","0",true); |
| 566 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); | 565 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); |
| @@ -603,7 +602,6 @@ namespace OpenSim.Framework.Types | |||
| 603 | configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); | 602 | configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); |
| 604 | configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", "20.0", true); | 603 | configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", "20.0", true); |
| 605 | configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); | 604 | configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); |
| 606 | |||
| 607 | } | 605 | } |
| 608 | 606 | ||
| 609 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 607 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |