aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie2010-02-14 22:27:39 +0000
committerMelanie2010-02-14 22:27:39 +0000
commit2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch)
tree1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Region/ClientStack/LindenUDP
parentResolve a merge issue (diff)
parent* SQLite match code casing with regionsettings table field casing (what's wit... (diff)
downloadopensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip
opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz
opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2
opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3d9eaa1..f98e741 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3286,9 +3286,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3286 awb.ItemID = wearables[i].ItemID; 3286 awb.ItemID = wearables[i].ItemID;
3287 aw.WearableData[i] = awb; 3287 aw.WearableData[i] = awb;
3288 3288
3289 // m_log.DebugFormat( 3289// m_log.DebugFormat(
3290 // "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}", 3290// "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
3291 // awb.ItemID, awb.AssetID, i, Name); 3291// awb.ItemID, awb.AssetID, i, Name);
3292 } 3292 }
3293 3293
3294 OutPacket(aw, ThrottleOutPacketType.Task); 3294 OutPacket(aw, ThrottleOutPacketType.Task);
@@ -8294,8 +8294,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8294 { 8294 {
8295 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), 8295 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter),
8296 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), 8296 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter),
8297 Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter))), 8297 Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter), Culture.NumberFormatInfo)),
8298 (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)), 8298 (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo),
8299 Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), 8299 Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)),
8300 convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); 8300 convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter));
8301 } 8301 }
@@ -8343,8 +8343,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8343 if (splitField.Length == 3) 8343 if (splitField.Length == 3)
8344 { 8344 {
8345 Int16 corner = Convert.ToInt16(splitField[0]); 8345 Int16 corner = Convert.ToInt16(splitField[0]);
8346 float lowValue = (float)Convert.ToDecimal(splitField[1]); 8346 float lowValue = (float)Convert.ToDecimal(splitField[1], Culture.NumberFormatInfo);
8347 float highValue = (float)Convert.ToDecimal(splitField[2]); 8347 float highValue = (float)Convert.ToDecimal(splitField[2], Culture.NumberFormatInfo);
8348 8348
8349 OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); 8349 OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue);
8350 } 8350 }
@@ -8367,19 +8367,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8367 { 8367 {
8368 string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); 8368 string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter);
8369 if (!tmp.Contains(".")) tmp += ".00"; 8369 if (!tmp.Contains(".")) tmp += ".00";
8370 float WaterHeight = (float)Convert.ToDecimal(tmp); 8370 float WaterHeight = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
8371 tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); 8371 tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter);
8372 if (!tmp.Contains(".")) tmp += ".00"; 8372 if (!tmp.Contains(".")) tmp += ".00";
8373 float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp); 8373 float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
8374 tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); 8374 tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter);
8375 if (!tmp.Contains(".")) tmp += ".00"; 8375 if (!tmp.Contains(".")) tmp += ".00";
8376 float TerrainLowerLimit = (float)Convert.ToDecimal(tmp); 8376 float TerrainLowerLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
8377 bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); 8377 bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter);
8378 bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); 8378 bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter);
8379 float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)); 8379 float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo);
8380 bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); 8380 bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter);
8381 bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); 8381 bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter);
8382 float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter)); 8382 float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter), Culture.NumberFormatInfo);
8383 8383
8384 OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); 8384 OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour);
8385 8385
@@ -13911,8 +13911,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
13911 { 13911 {
13912 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), 13912 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter),
13913 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), 13913 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter),
13914 Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter))), 13914 Convert.ToInt16(Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[4].Parameter), Culture.NumberFormatInfo)),
13915 (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)), 13915 (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo),
13916 Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)), 13916 Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[6].Parameter)),
13917 convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter)); 13917 convertParamStringToBool(messagePacket.ParamList[7].Parameter), convertParamStringToBool(messagePacket.ParamList[8].Parameter));
13918 } 13918 }
@@ -13960,8 +13960,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
13960 if (splitField.Length == 3) 13960 if (splitField.Length == 3)
13961 { 13961 {
13962 Int16 corner = Convert.ToInt16(splitField[0]); 13962 Int16 corner = Convert.ToInt16(splitField[0]);
13963 float lowValue = (float)Convert.ToDecimal(splitField[1]); 13963 float lowValue = (float)Convert.ToDecimal(splitField[1], Culture.NumberFormatInfo);
13964 float highValue = (float)Convert.ToDecimal(splitField[2]); 13964 float highValue = (float)Convert.ToDecimal(splitField[2], Culture.NumberFormatInfo);
13965 13965
13966 OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue); 13966 OnSetEstateTerrainTextureHeights(this, corner, lowValue, highValue);
13967 } 13967 }
@@ -13984,19 +13984,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
13984 { 13984 {
13985 string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter); 13985 string tmp = Utils.BytesToString(messagePacket.ParamList[0].Parameter);
13986 if (!tmp.Contains(".")) tmp += ".00"; 13986 if (!tmp.Contains(".")) tmp += ".00";
13987 float WaterHeight = (float)Convert.ToDecimal(tmp); 13987 float WaterHeight = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
13988 tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter); 13988 tmp = Utils.BytesToString(messagePacket.ParamList[1].Parameter);
13989 if (!tmp.Contains(".")) tmp += ".00"; 13989 if (!tmp.Contains(".")) tmp += ".00";
13990 float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp); 13990 float TerrainRaiseLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
13991 tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter); 13991 tmp = Utils.BytesToString(messagePacket.ParamList[2].Parameter);
13992 if (!tmp.Contains(".")) tmp += ".00"; 13992 if (!tmp.Contains(".")) tmp += ".00";
13993 float TerrainLowerLimit = (float)Convert.ToDecimal(tmp); 13993 float TerrainLowerLimit = (float)Convert.ToDecimal(tmp, Culture.NumberFormatInfo);
13994 bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter); 13994 bool UseEstateSun = convertParamStringToBool(messagePacket.ParamList[3].Parameter);
13995 bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter); 13995 bool UseFixedSun = convertParamStringToBool(messagePacket.ParamList[4].Parameter);
13996 float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter)); 13996 float SunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[5].Parameter), Culture.NumberFormatInfo);
13997 bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter); 13997 bool UseGlobal = convertParamStringToBool(messagePacket.ParamList[6].Parameter);
13998 bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter); 13998 bool EstateFixedSun = convertParamStringToBool(messagePacket.ParamList[7].Parameter);
13999 float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter)); 13999 float EstateSunHour = (float)Convert.ToDecimal(Utils.BytesToString(messagePacket.ParamList[8].Parameter), Culture.NumberFormatInfo);
14000 14000
14001 OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour); 14001 OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseEstateSun, UseFixedSun, SunHour, UseGlobal, EstateFixedSun, EstateSunHour);
14002 14002