diff options
author | Diva Canto | 2011-05-27 08:19:40 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-27 08:19:40 -0700 |
commit | d60f525baa8697f896b9f756175118828db9ac78 (patch) | |
tree | 7d38e8a8e578f84261ffb42adad7daf09a983ed4 /OpenSim/Services | |
parent | Added a BasicProfilemodule so that the profile-based actions (like give inven... (diff) | |
download | opensim-SC_OLD-d60f525baa8697f896b9f756175118828db9ac78.zip opensim-SC_OLD-d60f525baa8697f896b9f756175118828db9ac78.tar.gz opensim-SC_OLD-d60f525baa8697f896b9f756175118828db9ac78.tar.bz2 opensim-SC_OLD-d60f525baa8697f896b9f756175118828db9ac78.tar.xz |
HG inventory transfers over the profile working.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 9ee1ae4..4eb61ba 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -134,6 +134,7 @@ namespace OpenSim.Services.HypergridService | |||
134 | 134 | ||
135 | public override InventoryFolderBase GetRootFolder(UUID principalID) | 135 | public override InventoryFolderBase GetRootFolder(UUID principalID) |
136 | { | 136 | { |
137 | //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID); | ||
137 | // Warp! Root folder for travelers | 138 | // Warp! Root folder for travelers |
138 | XInventoryFolder[] folders = m_Database.GetFolders( | 139 | XInventoryFolder[] folders = m_Database.GetFolders( |
139 | new string[] { "agentID", "folderName"}, | 140 | new string[] { "agentID", "folderName"}, |
@@ -171,6 +172,7 @@ namespace OpenSim.Services.HypergridService | |||
171 | 172 | ||
172 | public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type) | 173 | public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type) |
173 | { | 174 | { |
175 | //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type); | ||
174 | return GetRootFolder(principalID); | 176 | return GetRootFolder(principalID); |
175 | } | 177 | } |
176 | 178 | ||
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 58c59eb..eeab67a 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -40,9 +40,9 @@ namespace OpenSim.Services.InventoryService | |||
40 | { | 40 | { |
41 | public class XInventoryService : ServiceBase, IInventoryService | 41 | public class XInventoryService : ServiceBase, IInventoryService |
42 | { | 42 | { |
43 | // private static readonly ILog m_log = | 43 | //private static readonly ILog m_log = |
44 | // LogManager.GetLogger( | 44 | // LogManager.GetLogger( |
45 | // MethodBase.GetCurrentMethod().DeclaringType); | 45 | // MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected IXInventoryData m_Database; | 47 | protected IXInventoryData m_Database; |
48 | protected bool m_AllowDelete = true; | 48 | protected bool m_AllowDelete = true; |
@@ -385,8 +385,8 @@ namespace OpenSim.Services.InventoryService | |||
385 | 385 | ||
386 | public virtual bool AddItem(InventoryItemBase item) | 386 | public virtual bool AddItem(InventoryItemBase item) |
387 | { | 387 | { |
388 | // m_log.DebugFormat( | 388 | //m_log.DebugFormat( |
389 | // "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner); | 389 | // "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner); |
390 | 390 | ||
391 | return m_Database.StoreItem(ConvertFromOpenSim(item)); | 391 | return m_Database.StoreItem(ConvertFromOpenSim(item)); |
392 | } | 392 | } |