diff options
| author | John Hurliman | 2010-06-11 15:43:22 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-06-11 15:43:22 -0700 |
| commit | b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be (patch) | |
| tree | 95db3efbd631a46c2006fc94dd5ed869ccfcc61a /OpenSim/Tests | |
| parent | * Added a new method to IMapImageGenerator for getting the map tile before it... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.zip opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.gz opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.bz2 opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockInventoryService.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs index fc27487..1ea4bc1 100644 --- a/OpenSim/Tests/Common/Mock/MockInventoryService.cs +++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs | |||
| @@ -162,11 +162,6 @@ namespace OpenSim.Tests.Common.Mock | |||
| 162 | { | 162 | { |
| 163 | return null; | 163 | return null; |
| 164 | } | 164 | } |
| 165 | |||
| 166 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
| 167 | { | ||
| 168 | return null; | ||
| 169 | } | ||
| 170 | 165 | ||
| 171 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 166 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
| 172 | { | 167 | { |