diff options
author | BlueWall | 2012-12-07 15:36:43 -0500 |
---|---|---|
committer | BlueWall | 2012-12-07 15:36:43 -0500 |
commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Framework/Tests | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r-- | OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs index 47fe599..1dc8053 100644 --- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs +++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs | |||
@@ -303,10 +303,6 @@ namespace OpenSim.Framework.Tests | |||
303 | Culture.SetCurrentCulture(); | 303 | Culture.SetCurrentCulture(); |
304 | Assert.That(Thread.CurrentThread.CurrentCulture.Name == ci.Name, "SetCurrentCulture failed to set thread culture to en-US"); | 304 | Assert.That(Thread.CurrentThread.CurrentCulture.Name == ci.Name, "SetCurrentCulture failed to set thread culture to en-US"); |
305 | 305 | ||
306 | } | 306 | } |
307 | |||
308 | |||
309 | |||
310 | } | 307 | } |
311 | } | 308 | } \ No newline at end of file |
312 | |||