diff options
author | Diva Canto | 2013-07-21 14:39:50 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-21 15:42:22 -0700 |
commit | df63bfafefe431faf21ec1c52dbff78977f971e6 (patch) | |
tree | 5e1e584eb5ce90ccebec9e2584af688359e3d8ee /OpenSim/Services/HypergridService | |
parent | Add the Current Outfit folder as an available folder in the SuitcaseInventory. (diff) | |
download | opensim-SC-df63bfafefe431faf21ec1c52dbff78977f971e6.zip opensim-SC-df63bfafefe431faf21ec1c52dbff78977f971e6.tar.gz opensim-SC-df63bfafefe431faf21ec1c52dbff78977f971e6.tar.bz2 opensim-SC-df63bfafefe431faf21ec1c52dbff78977f971e6.tar.xz |
Better version of previous commit
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 06c5b89..0601ece 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -495,9 +495,13 @@ namespace OpenSim.Services.HypergridService | |||
495 | 495 | ||
496 | private XInventoryFolder GetCurrentOutfitXFolder(UUID userID) | 496 | private XInventoryFolder GetCurrentOutfitXFolder(UUID userID) |
497 | { | 497 | { |
498 | XInventoryFolder root = GetRootXFolder(userID); | ||
499 | if (root == null) | ||
500 | return null; | ||
501 | |||
498 | XInventoryFolder[] folders = m_Database.GetFolders( | 502 | XInventoryFolder[] folders = m_Database.GetFolders( |
499 | new string[] { "agentID", "type" }, | 503 | new string[] { "agentID", "type", "parentFolderID" }, |
500 | new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString() }); | 504 | new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString(), root.folderID.ToString() }); |
501 | 505 | ||
502 | if (folders.Length == 0) | 506 | if (folders.Length == 0) |
503 | return null; | 507 | return null; |