OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis#1005. Thank you kindly, Mircea for a two patches that: 

Addresses both locale issues and setting the waterHeight correctly.
0.6.0-stable
Charles Krinke 2008-07-11 15:40:56 +00:00
parent aad55e5034
commit 1472cee72f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/EstateSettings.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Framework
private int m_redirectGridY; private int m_redirectGridY;
private bool m_regionAllowTerraform; private bool m_regionAllowTerraform;
private Simulator.RegionFlags m_regionFlags; private Simulator.RegionFlags m_regionFlags;
private ushort m_regionWaterHeight; private float m_regionWaterHeight;
private Simulator.SimAccess m_simAccess; private Simulator.SimAccess m_simAccess;
private float m_sunHour; private float m_sunHour;
private LLVector3 m_sunPosition; private LLVector3 m_sunPosition;
@ -256,7 +256,7 @@ namespace OpenSim.Framework
} }
public ushort regionWaterHeight public float regionWaterHeight
{ {
get { return m_regionWaterHeight; } get { return m_regionWaterHeight; }
set set
@ -781,7 +781,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
String.Empty, "1", true); String.Empty, "1", true);
configMember.addConfigurationOption("region_water_height", 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", configMember.addConfigurationOption("region_allow_terraform",
ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true);
@ -903,7 +903,7 @@ namespace OpenSim.Framework
m_pricePerMeter = Convert.ToInt32(configuration_result); m_pricePerMeter = Convert.ToInt32(configuration_result);
break; break;
case "region_water_height": case "region_water_height":
m_regionWaterHeight = (ushort) configuration_result; m_regionWaterHeight = (float) configuration_result;
break; break;
case "region_allow_terraform": case "region_allow_terraform":
m_regionAllowTerraform = (bool) configuration_result; m_regionAllowTerraform = (bool) configuration_result;

5
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -715,6 +715,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
protected virtual void AuthUser() 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 try
{ {
// AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code);