diff options
| author | Melanie | 2009-11-28 09:26:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-28 09:26:00 +0000 |
| commit | d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch) | |
| tree | 044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Tests/Common | |
| parent | Reset update flag when a SOG is deleted. This fixes llDie(); (diff) | |
| parent | Add some conditionals to references to the WorldComm module, so that the (diff) | |
| download | opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2 opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs (renamed from OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs index 20ea18f..cc1dfbf 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | |||
| @@ -38,10 +38,10 @@ namespace OpenSim.Tests.Common.Mock | |||
| 38 | /// mono addin plugin system starts co-operating with the unit test system. Currently no locking since unit | 38 | /// mono addin plugin system starts co-operating with the unit test system. Currently no locking since unit |
| 39 | /// tests are single threaded. | 39 | /// tests are single threaded. |
| 40 | /// </summary> | 40 | /// </summary> |
| 41 | public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin | 41 | public class MockAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin |
| 42 | { | 42 | { |
| 43 | public string Version { get { return "0"; } } | 43 | public string Version { get { return "0"; } } |
| 44 | public string Name { get { return "TestAssetDataPlugin"; } } | 44 | public string Name { get { return "MockAssetDataPlugin"; } } |
| 45 | 45 | ||
| 46 | public void Initialise() {} | 46 | public void Initialise() {} |
| 47 | public void Initialise(string connect) {} | 47 | public void Initialise(string connect) {} |