diff options
author | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
commit | 908cebbea8d7e685223b22ef8216971daccbdd53 (patch) | |
tree | 9827cf434e8013a4618bb278857d68373054f882 /OpenSim/Services/HypergridService/HGInventoryService.cs | |
parent | remove possible PhysActor unexpectedly null race conditions when changing pri... (diff) | |
parent | Deleted the unused and commented code from 2 commits ago. (diff) | |
download | opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.zip opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.gz opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.bz2 opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index b29d803..2e9bd40 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -105,6 +105,12 @@ namespace OpenSim.Services.HypergridService | |||
105 | return new List<InventoryFolderBase>(); | 105 | return new List<InventoryFolderBase>(); |
106 | } | 106 | } |
107 | 107 | ||
108 | public override InventoryCollection GetUserInventory(UUID userID) | ||
109 | { | ||
110 | // NOGO for this inventory service | ||
111 | return null; | ||
112 | } | ||
113 | |||
108 | public override InventoryFolderBase GetRootFolder(UUID principalID) | 114 | public override InventoryFolderBase GetRootFolder(UUID principalID) |
109 | { | 115 | { |
110 | //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID); | 116 | //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID); |