aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-07-11 15:40:56 +0000
committerCharles Krinke2008-07-11 15:40:56 +0000
commit1472cee72f984ff8001904303de13f2f8eace965 (patch)
treec73790884804009713981fb5a40e7302e00307f6
parent* Comment out body of experimental ParcelMediaSetTime() since MW says it caus... (diff)
downloadopensim-SC_OLD-1472cee72f984ff8001904303de13f2f8eace965.zip
opensim-SC_OLD-1472cee72f984ff8001904303de13f2f8eace965.tar.gz
opensim-SC_OLD-1472cee72f984ff8001904303de13f2f8eace965.tar.bz2
opensim-SC_OLD-1472cee72f984ff8001904303de13f2f8eace965.tar.xz
Mantis#1005. Thank you kindly, Mircea for a two patches that:
Addresses both locale issues and setting the waterHeight correctly.
-rw-r--r--OpenSim/Framework/EstateSettings.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs5
2 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 997caad..aa8688b 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Framework
62 private int m_redirectGridY; 62 private int m_redirectGridY;
63 private bool m_regionAllowTerraform; 63 private bool m_regionAllowTerraform;
64 private Simulator.RegionFlags m_regionFlags; 64 private Simulator.RegionFlags m_regionFlags;
65 private ushort m_regionWaterHeight; 65 private float m_regionWaterHeight;
66 private Simulator.SimAccess m_simAccess; 66 private Simulator.SimAccess m_simAccess;
67 private float m_sunHour; 67 private float m_sunHour;
68 private LLVector3 m_sunPosition; 68 private LLVector3 m_sunPosition;
@@ -256,7 +256,7 @@ namespace OpenSim.Framework
256 } 256 }
257 257
258 258
259 public ushort regionWaterHeight 259 public float regionWaterHeight
260 { 260 {
261 get { return m_regionWaterHeight; } 261 get { return m_regionWaterHeight; }
262 set 262 set
@@ -781,7 +781,7 @@ namespace OpenSim.Framework
781 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 781 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
782 String.Empty, "1", true); 782 String.Empty, "1", true);
783 configMember.addConfigurationOption("region_water_height", 783 configMember.addConfigurationOption("region_water_height",
784 ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true); 784 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "20", true);
785 configMember.addConfigurationOption("region_allow_terraform", 785 configMember.addConfigurationOption("region_allow_terraform",
786 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); 786 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true);
787 787
@@ -903,7 +903,7 @@ namespace OpenSim.Framework
903 m_pricePerMeter = Convert.ToInt32(configuration_result); 903 m_pricePerMeter = Convert.ToInt32(configuration_result);
904 break; 904 break;
905 case "region_water_height": 905 case "region_water_height":
906 m_regionWaterHeight = (ushort) configuration_result; 906 m_regionWaterHeight = (float) configuration_result;
907 break; 907 break;
908 case "region_allow_terraform": 908 case "region_allow_terraform":
909 m_regionAllowTerraform = (bool) configuration_result; 909 m_regionAllowTerraform = (bool) configuration_result;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0e546db..8293319 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -715,6 +715,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
715 /// </summary> 715 /// </summary>
716 protected virtual void AuthUser() 716 protected virtual void AuthUser()
717 { 717 {
718
719 //tell this thread we are using the culture set up for the sim (currently hardcoded to en_US)
720 //otherwise it will override this and use the system default
721 Culture.SetCurrentCulture();
722
718 try 723 try
719 { 724 {
720 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); 725 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code);