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/Tests/Common/Mock | |
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/Tests/Common/Mock')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestInventoryService.cs | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index bf4ddf0..fe31729 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -120,6 +120,7 @@ namespace OpenSim.Tests.Common.Mock | |||
120 | public event ObjectExtraParams OnUpdateExtraParams; | 120 | public event ObjectExtraParams OnUpdateExtraParams; |
121 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; | 121 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; |
122 | public event ObjectSelect OnObjectSelect; | 122 | public event ObjectSelect OnObjectSelect; |
123 | public event ObjectRequest OnObjectRequest; | ||
123 | public event GenericCall7 OnObjectDescription; | 124 | public event GenericCall7 OnObjectDescription; |
124 | public event GenericCall7 OnObjectName; | 125 | public event GenericCall7 OnObjectName; |
125 | public event GenericCall7 OnObjectClickAction; | 126 | public event GenericCall7 OnObjectClickAction; |
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/TestInventoryService.cs index 6635700..ba9cbe9 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryService.cs | |||
@@ -148,12 +148,12 @@ namespace OpenSim.Tests.Common.Mock | |||
148 | return false; | 148 | return false; |
149 | } | 149 | } |
150 | 150 | ||
151 | public InventoryItemBase QueryItem(InventoryItemBase item) | 151 | public InventoryItemBase GetItem(InventoryItemBase item) |
152 | { | 152 | { |
153 | return null; | 153 | return null; |
154 | } | 154 | } |
155 | 155 | ||
156 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 156 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
157 | { | 157 | { |
158 | return null; | 158 | return null; |
159 | } | 159 | } |
@@ -171,5 +171,10 @@ namespace OpenSim.Tests.Common.Mock | |||
171 | root.ParentID = UUID.Zero; | 171 | root.ParentID = UUID.Zero; |
172 | return root; | 172 | return root; |
173 | } | 173 | } |
174 | |||
175 | public int GetAssetPermissions(UUID userID, UUID assetID) | ||
176 | { | ||
177 | return 1; | ||
178 | } | ||
174 | } | 179 | } |
175 | } | 180 | } |