diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs index 79fcc2d..a2f0a4c 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLEstateTest : BasicEstateTest | 37 | public class MySQLEstateTest : BasicEstateTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs index fd71022..a1b973a 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLGridTest : BasicGridTest | 37 | public class MySQLGridTest : BasicGridTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index c7799e5..298b4fc 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLInventoryTest : BasicInventoryTest | 37 | public class MySQLInventoryTest : BasicInventoryTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs index 77964d3..ff64e59 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLRegionTest : BasicRegionTest | 37 | public class MySQLRegionTest : BasicRegionTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs index 449ce4a..920fcf1 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | 33 | ||
34 | namespace OpenSim.Data.MySQL.Tests | 34 | namespace OpenSim.Data.MySQL.Tests |
35 | { | 35 | { |
36 | [TestFixture] | 36 | [TestFixture, DatabaseTest] |
37 | public class MySQLUserTest : BasicUserTest | 37 | public class MySQLUserTest : BasicUserTest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 93a6300..f51e639 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Text.RegularExpressions; | 30 | using System.Text.RegularExpressions; |
31 | using OpenSim.Framework; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.ScriptEngine.Shared | 33 | namespace OpenSim.Region.ScriptEngine.Shared |
33 | { | 34 | { |
@@ -1787,7 +1788,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1787 | else | 1788 | else |
1788 | if (v.EndsWith(".")) | 1789 | if (v.EndsWith(".")) |
1789 | v = v + "0"; | 1790 | v = v + "0"; |
1790 | this.value = double.Parse(v, System.Globalization.NumberStyles.Float); | 1791 | this.value = double.Parse(v, System.Globalization.NumberStyles.Float, Culture.FormatProvider); |
1791 | } | 1792 | } |
1792 | 1793 | ||
1793 | #endregion | 1794 | #endregion |