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/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.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/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index 22289aa..5cbd307 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -156,12 +156,12 @@ namespace OpenSim.Services.Connectors | |||
156 | return false; | 156 | return false; |
157 | } | 157 | } |
158 | 158 | ||
159 | public InventoryItemBase QueryItem(InventoryItemBase item) | 159 | public InventoryItemBase GetItem(InventoryItemBase item) |
160 | { | 160 | { |
161 | return null; | 161 | return null; |
162 | } | 162 | } |
163 | 163 | ||
164 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 164 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
165 | { | 165 | { |
166 | return null; | 166 | return null; |
167 | } | 167 | } |
@@ -176,5 +176,10 @@ namespace OpenSim.Services.Connectors | |||
176 | return null; | 176 | return null; |
177 | } | 177 | } |
178 | 178 | ||
179 | public int GetAssetPermissions(UUID userID, UUID assetID) | ||
180 | { | ||
181 | return 0; | ||
182 | } | ||
183 | |||
179 | } | 184 | } |
180 | } | 185 | } |