diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /OpenSim/Framework/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -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 a933ae0..0fbdaf3 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 | |||