diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e38232c..e39323f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8307,8 +8307,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8307 | { | 8307 | { |
8308 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), | 8308 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), |
8309 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), | 8309 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), |
8310 | Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter))), | 8310 | Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter), Culture.NumberFormatInfo)), |
8311 | (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)), | 8311 | (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo), |
8312 | Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), | 8312 | Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), |
8313 | convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); | 8313 | convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); |
8314 | } | 8314 | } |
@@ -8356,8 +8356,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8356 | if (splitField.Length == 3) | 8356 | if (splitField.Length == 3) |
8357 | { | 8357 | { |
8358 | Int16 corner = Convert.ToInt16(splitField[0]); | 8358 | Int16 corner = Convert.ToInt16(splitField[0]); |
8359 | float lowValue = (float)Convert.ToDecimal(splitField[1]); | 8359 | float lowValue = (float)Convert.ToDecimal(splitField[1], Culture.NumberFormatInfo); |
8360 | float highValue = (float)Convert.ToDecimal(splitField[2]); | 8360 | float highValue = (float)Convert.ToDecimal(splitField[2], Culture.NumberFormatInfo); |
8361 | 8361 | ||
8362 | OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); | 8362 | OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); |
8363 | } | 8363 | } |
@@ -8380,19 +8380,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8380 | { | 8380 | { |
8381 | string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); | 8381 | string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); |
8382 | if (!tmp.Contains(".")) tmp += ".00"; | 8382 | if (!tmp.Contains(".")) tmp += ".00"; |
8383 | float WaterHeight = (float)Convert.ToDecimal(tmp); | 8383 | float WaterHeight = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
8384 | tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); | 8384 | tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); |
8385 | if (!tmp.Contains(".")) tmp += ".00"; | 8385 | if (!tmp.Contains(".")) tmp += ".00"; |
8386 | float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp); | 8386 | float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
8387 | tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); | 8387 | tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); |
8388 | if (!tmp.Contains(".")) tmp += ".00"; | 8388 | if (!tmp.Contains(".")) tmp += ".00"; |
8389 | float TerrainLowerLimit = (float)Convert.ToDecimal(tmp); | 8389 | float TerrainLowerLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
8390 | bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); | 8390 | bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); |
8391 | bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); | 8391 | bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); |
8392 | float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)); | 8392 | float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo); |
8393 | bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); | 8393 | bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); |
8394 | bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); | 8394 | bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); |
8395 | float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter)); | 8395 | float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter), Culture.NumberFormatInfo); |
8396 | 8396 | ||
8397 | OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); | 8397 | OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); |
8398 | 8398 | ||
@@ -13924,8 +13924,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
13924 | { | 13924 | { |
13925 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), | 13925 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), |
13926 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), | 13926 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), |
13927 | Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter))), | 13927 | Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter), Culture.NumberFormatInfo)), |
13928 | (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)), | 13928 | (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo), |
13929 | Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), | 13929 | Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), |
13930 | convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); | 13930 | convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); |
13931 | } | 13931 | } |
@@ -13973,8 +13973,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
13973 | if (splitField.Length == 3) | 13973 | if (splitField.Length == 3) |
13974 | { | 13974 | { |
13975 | Int16 corner = Convert.ToInt16(splitField[0]); | 13975 | Int16 corner = Convert.ToInt16(splitField[0]); |
13976 | float lowValue = (float)Convert.ToDecimal(splitField[1]); | 13976 | float lowValue = (float)Convert.ToDecimal(splitField[1], Culture.NumberFormatInfo); |
13977 | float highValue = (float)Convert.ToDecimal(splitField[2]); | 13977 | float highValue = (float)Convert.ToDecimal(splitField[2], Culture.NumberFormatInfo); |
13978 | 13978 | ||
13979 | OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); | 13979 | OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); |
13980 | } | 13980 | } |
@@ -13997,19 +13997,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
13997 | { | 13997 | { |
13998 | string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); | 13998 | string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); |
13999 | if (!tmp.Contains(".")) tmp += ".00"; | 13999 | if (!tmp.Contains(".")) tmp += ".00"; |
14000 | float WaterHeight = (float)Convert.ToDecimal(tmp); | 14000 | float WaterHeight = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
14001 | tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); | 14001 | tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); |
14002 | if (!tmp.Contains(".")) tmp += ".00"; | 14002 | if (!tmp.Contains(".")) tmp += ".00"; |
14003 | float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp); | 14003 | float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
14004 | tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); | 14004 | tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); |
14005 | if (!tmp.Contains(".")) tmp += ".00"; | 14005 | if (!tmp.Contains(".")) tmp += ".00"; |
14006 | float TerrainLowerLimit = (float)Convert.ToDecimal(tmp); | 14006 | float TerrainLowerLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo); |
14007 | bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); | 14007 | bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); |
14008 | bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); | 14008 | bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); |
14009 | float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)); | 14009 | float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo); |
14010 | bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); | 14010 | bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); |
14011 | bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); | 14011 | bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); |
14012 | float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter)); | 14012 | float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter), Culture.NumberFormatInfo); |
14013 | 14013 | ||
14014 | OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); | 14014 | OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); |
14015 | 14015 | ||