diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |
parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz |
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/Communications/Tests/LoginServiceTests.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index b1b7809..22dcef9 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -552,12 +552,12 @@ namespace OpenSim.Framework.Communications.Tests | |||
552 | return false; | 552 | return false; |
553 | } | 553 | } |
554 | 554 | ||
555 | public InventoryItemBase QueryItem(InventoryItemBase item) | 555 | public InventoryItemBase GetItem(InventoryItemBase item) |
556 | { | 556 | { |
557 | return null; | 557 | return null; |
558 | } | 558 | } |
559 | 559 | ||
560 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 560 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
561 | { | 561 | { |
562 | return null; | 562 | return null; |
563 | } | 563 | } |
@@ -575,5 +575,10 @@ namespace OpenSim.Framework.Communications.Tests | |||
575 | root.ParentID = UUID.Zero; | 575 | root.ParentID = UUID.Zero; |
576 | return root; | 576 | return root; |
577 | } | 577 | } |
578 | |||
579 | public int GetAssetPermissions(UUID userID, UUID assetID) | ||
580 | { | ||
581 | return 1; | ||
582 | } | ||
578 | } | 583 | } |
579 | } | 584 | } |