diff options
author | Melanie | 2010-10-09 01:05:05 +0100 |
---|---|---|
committer | Melanie | 2010-10-09 01:05:05 +0100 |
commit | 96080dc492d3dc7d9a39a47044b1d89f6c9c6ac5 (patch) | |
tree | acd0f32b1c49e653aa7cbeebe48cd400d0e5ad5a /OpenSim/Framework/Tests | |
parent | Fix an infinite recursion (diff) | |
parent | minor: remove some mono compiler warnings (diff) | |
download | opensim-SC_OLD-96080dc492d3dc7d9a39a47044b1d89f6c9c6ac5.zip opensim-SC_OLD-96080dc492d3dc7d9a39a47044b1d89f6c9c6ac5.tar.gz opensim-SC_OLD-96080dc492d3dc7d9a39a47044b1d89f6c9c6ac5.tar.bz2 opensim-SC_OLD-96080dc492d3dc7d9a39a47044b1d89f6c9c6ac5.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r-- | OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs index 04be083..e7f8bfc 100644 --- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs +++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs | |||
@@ -140,10 +140,10 @@ namespace OpenSim.Framework.Tests | |||
140 | settings.Save(); | 140 | settings.Save(); |
141 | settings.OnSave -= RegionSaveFired; | 141 | settings.OnSave -= RegionSaveFired; |
142 | 142 | ||
143 | string str = settings.LoadedCreationDate; | 143 | // string str = settings.LoadedCreationDate; |
144 | int dt = settings.LoadedCreationDateTime; | 144 | // int dt = settings.LoadedCreationDateTime; |
145 | string id = settings.LoadedCreationID; | 145 | // string id = settings.LoadedCreationID; |
146 | string time = settings.LoadedCreationTime; | 146 | // string time = settings.LoadedCreationTime; |
147 | 147 | ||
148 | Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire"); | 148 | Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire"); |
149 | 149 | ||