aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-23 17:04:48 +0100
committerUbitUmarov2015-09-23 17:04:48 +0100
commit592ba85b0a218eb75c0739d85efb461b6098977f (patch)
treea8c1fe5a101019e777a2b15a041b0ee93e653c55
parent fix for future non square regions (diff)
downloadopensim-SC_OLD-592ba85b0a218eb75c0739d85efb461b6098977f.zip
opensim-SC_OLD-592ba85b0a218eb75c0739d85efb461b6098977f.tar.gz
opensim-SC_OLD-592ba85b0a218eb75c0739d85efb461b6098977f.tar.bz2
opensim-SC_OLD-592ba85b0a218eb75c0739d85efb461b6098977f.tar.xz
add Culture.FormatProvider on all casts to LSLString on Vectors and Quaternions. This may need better checking
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 5fce15c..7738948 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -108,13 +108,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
108 108
109 public static explicit operator LSLString(Vector3 vec) 109 public static explicit operator LSLString(Vector3 vec)
110 { 110 {
111 string s = String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z); 111 string s = String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
112 return new LSLString(s); 112 return new LSLString(s);
113 } 113 }
114 114
115 public static explicit operator string(Vector3 vec) 115 public static explicit operator string(Vector3 vec)
116 { 116 {
117 string s = String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z); 117 string s = String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
118 return s; 118 return s;
119 } 119 }
120 120
@@ -420,13 +420,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
420 420
421 public static explicit operator string(Quaternion r) 421 public static explicit operator string(Quaternion r)
422 { 422 {
423 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s); 423 string s=String.Format(Culture.FormatProvider,"<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
424 return s; 424 return s;
425 } 425 }
426 426
427 public static explicit operator LSLString(Quaternion r) 427 public static explicit operator LSLString(Quaternion r)
428 { 428 {
429 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s); 429 string s=String.Format(Culture.FormatProvider,"<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
430 return new LSLString(s); 430 return new LSLString(s);
431 } 431 }
432 432
@@ -1534,8 +1534,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
1534 } 1534 }
1535 } 1535 }
1536 1536
1537
1538
1539 static public implicit operator String(LSLString s) 1537 static public implicit operator String(LSLString s)
1540 { 1538 {
1541 return s.m_string; 1539 return s.m_string;