diff options
| author | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
|---|---|---|
| committer | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
| commit | 140ea04b9d692344d803fc87364fb252561725c3 (patch) | |
| tree | d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/Services/HypergridService/HGInventoryService.cs | |
| parent | Merge pull request #7 from gamucf/moses.metricsPhase2 (diff) | |
| parent | resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff) | |
| download | opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.xz | |
Merging Opensim upstream before generating patch
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 2c63240..5f245e4 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
| @@ -153,7 +153,14 @@ namespace OpenSim.Services.HypergridService | |||
| 153 | //public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) | 153 | //public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) |
| 154 | //{ | 154 | //{ |
| 155 | //} | 155 | //} |
| 156 | 156 | ||
| 157 | // NOGO | ||
| 158 | // | ||
| 159 | public override InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderID) | ||
| 160 | { | ||
| 161 | return new InventoryCollection[0]; | ||
| 162 | } | ||
| 163 | |||
| 157 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
| 158 | //{ | 165 | //{ |
| 159 | //} | 166 | //} |