aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs6
-rw-r--r--OpenSim/Framework/EstateSettings.cs6
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
3 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index cb434f0..c363ec0 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -420,7 +420,7 @@ namespace OpenSim.Framework
420 case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: 420 case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
421 float floatResult; 421 float floatResult;
422 if ( 422 if (
423 float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, 423 float.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
424 out floatResult)) 424 out floatResult))
425 { 425 {
426 convertSuccess = true; 426 convertSuccess = true;
@@ -431,7 +431,7 @@ namespace OpenSim.Framework
431 case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: 431 case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
432 double doubleResult; 432 double doubleResult;
433 if ( 433 if (
434 Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, 434 Double.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
435 out doubleResult)) 435 out doubleResult))
436 { 436 {
437 convertSuccess = true; 437 convertSuccess = true;
@@ -519,4 +519,4 @@ namespace OpenSim.Framework
519 configurationPlugin.Close(); 519 configurationPlugin.Close();
520 } 520 }
521 } 521 }
522} \ No newline at end of file 522}
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index d0e56ab..997caad 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -773,9 +773,9 @@ namespace OpenSim.Framework
773 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0", 773 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
774 true); 774 true);
775 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 775 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
776 String.Empty, "0", true); 776 String.Empty, "4.0", true); //4 is the LL default
777 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 777 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
778 String.Empty, "0", true); 778 String.Empty, "-4.0", true); //-4.0 is the LL default
779 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, 779 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty,
780 "false", true); 780 "false", true);
781 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 781 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -1013,4 +1013,4 @@ namespace OpenSim.Framework
1013 return true; 1013 return true;
1014 } 1014 }
1015 } 1015 }
1016} \ No newline at end of file 1016}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index fafd31d..e4fac1f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -410,7 +410,7 @@ namespace OpenSim.Framework
410 public delegate void ModifyTerrain( 410 public delegate void ModifyTerrain(
411 float height, float seconds, byte size, byte action, float north, float west, float south, float east, 411 float height, float seconds, byte size, byte action, float north, float west, float south, float east,
412 IClientAPI remoteClient); 412 IClientAPI remoteClient);
413 413
414 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList); 414 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList);
415 415
416 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID); 416 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID);
@@ -633,6 +633,7 @@ namespace OpenSim.Framework
633 public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal); 633 public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal);
634 public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient); 634 public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient);
635 public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool fixedSun, float sunHour); 635 public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool fixedSun, float sunHour);
636 public delegate void BakeTerrain(IClientAPI remoteClient );
636 public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot); 637 public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot);
637 public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID); 638 public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID);
638 public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user); 639 public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user);
@@ -693,6 +694,7 @@ namespace OpenSim.Framework
693 event RezObject OnRezObject; 694 event RezObject OnRezObject;
694 [Obsolete("LLClientView Specific - Replace with more suitable arguments.")] 695 [Obsolete("LLClientView Specific - Replace with more suitable arguments.")]
695 event ModifyTerrain OnModifyTerrain; 696 event ModifyTerrain OnModifyTerrain;
697 event BakeTerrain OnBakeTerrain;
696 [Obsolete("LLClientView Specific.")] 698 [Obsolete("LLClientView Specific.")]
697 event SetAppearance OnSetAppearance; 699 event SetAppearance OnSetAppearance;
698 [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] 700 [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]