diff options
| author | Melanie | 2010-10-09 01:07:41 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-09 01:07:41 +0100 |
| commit | 231feab57ff1e6d92388b75645382c865e65dea2 (patch) | |
| tree | 014c2218919051fdbb995c844ebb322145e1c36b /OpenSim/Framework/Tests | |
| parent | Fix a security relevant issue with take / take copy (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.zip opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.gz opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.bz2 opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
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 | ||