diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs index 79fcc2dcd1..a2f0a4ca84 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs @@ -33,7 +33,7 @@ using System.Reflection; namespace OpenSim.Data.MySQL.Tests { - [TestFixture] + [TestFixture, DatabaseTest] public class MySQLEstateTest : BasicEstateTest { 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 fd71022c9e..a1b973a004 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs @@ -33,7 +33,7 @@ using System.Reflection; namespace OpenSim.Data.MySQL.Tests { - [TestFixture] + [TestFixture, DatabaseTest] public class MySQLGridTest : BasicGridTest { 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 c7799e5ef0..298b4fc59c 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs @@ -33,7 +33,7 @@ using System.Reflection; namespace OpenSim.Data.MySQL.Tests { - [TestFixture] + [TestFixture, DatabaseTest] public class MySQLInventoryTest : BasicInventoryTest { 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 77964d3d0c..ff64e59283 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs @@ -33,7 +33,7 @@ using System.Reflection; namespace OpenSim.Data.MySQL.Tests { - [TestFixture] + [TestFixture, DatabaseTest] public class MySQLRegionTest : BasicRegionTest { 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 449ce4a3b0..920fcf1528 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs @@ -33,7 +33,7 @@ using System.Reflection; namespace OpenSim.Data.MySQL.Tests { - [TestFixture] + [TestFixture, DatabaseTest] public class MySQLUserTest : BasicUserTest { 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 93a630056a..f51e639bf7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -28,6 +28,7 @@ using System; using System.Collections; using System.Text.RegularExpressions; +using OpenSim.Framework; namespace OpenSim.Region.ScriptEngine.Shared { @@ -1787,7 +1788,7 @@ namespace OpenSim.Region.ScriptEngine.Shared else if (v.EndsWith(".")) v = v + "0"; - this.value = double.Parse(v, System.Globalization.NumberStyles.Float); + this.value = double.Parse(v, System.Globalization.NumberStyles.Float, Culture.FormatProvider); } #endregion