From 1472cee72f984ff8001904303de13f2f8eace965 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Fri, 11 Jul 2008 15:40:56 +0000 Subject: [PATCH] Mantis#1005. Thank you kindly, Mircea for a two patches that: Addresses both locale issues and setting the waterHeight correctly. --- OpenSim/Framework/EstateSettings.cs | 8 ++++---- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 997caad6c1..aa8688ba53 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -62,7 +62,7 @@ namespace OpenSim.Framework private int m_redirectGridY; private bool m_regionAllowTerraform; private Simulator.RegionFlags m_regionFlags; - private ushort m_regionWaterHeight; + private float m_regionWaterHeight; private Simulator.SimAccess m_simAccess; private float m_sunHour; private LLVector3 m_sunPosition; @@ -256,7 +256,7 @@ namespace OpenSim.Framework } - public ushort regionWaterHeight + public float regionWaterHeight { get { return m_regionWaterHeight; } set @@ -781,7 +781,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "1", true); configMember.addConfigurationOption("region_water_height", - ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "20", true); configMember.addConfigurationOption("region_allow_terraform", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); @@ -903,7 +903,7 @@ namespace OpenSim.Framework m_pricePerMeter = Convert.ToInt32(configuration_result); break; case "region_water_height": - m_regionWaterHeight = (ushort) configuration_result; + m_regionWaterHeight = (float) configuration_result; break; case "region_allow_terraform": m_regionAllowTerraform = (bool) configuration_result; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0e546db34b..8293319d44 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -715,6 +715,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// protected virtual void AuthUser() { + + //tell this thread we are using the culture set up for the sim (currently hardcoded to en_US) + //otherwise it will override this and use the system default + Culture.SetCurrentCulture(); + try { // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code);