aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-21 14:39:50 -0700
committerDiva Canto2013-07-26 15:53:34 -0700
commit028947f7b85e7147e8db01885144cf93ee677186 (patch)
tree80d6ea0ebea8b51df333b397496a29e3e99fb295
parentAdd the Current Outfit folder as an available folder in the SuitcaseInventory. (diff)
downloadopensim-SC_OLD-028947f7b85e7147e8db01885144cf93ee677186.zip
opensim-SC_OLD-028947f7b85e7147e8db01885144cf93ee677186.tar.gz
opensim-SC_OLD-028947f7b85e7147e8db01885144cf93ee677186.tar.bz2
opensim-SC_OLD-028947f7b85e7147e8db01885144cf93ee677186.tar.xz
Better version of previous commit
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 50552c1..c9f4d5a 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -474,9 +474,13 @@ namespace OpenSim.Services.HypergridService
474 474
475 private XInventoryFolder GetCurrentOutfitXFolder(UUID userID) 475 private XInventoryFolder GetCurrentOutfitXFolder(UUID userID)
476 { 476 {
477 XInventoryFolder root = GetRootXFolder(userID);
478 if (root == null)
479 return null;
480
477 XInventoryFolder[] folders = m_Database.GetFolders( 481 XInventoryFolder[] folders = m_Database.GetFolders(
478 new string[] { "agentID", "type" }, 482 new string[] { "agentID", "type", "parentFolderID" },
479 new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString() }); 483 new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString(), root.folderID.ToString() });
480 484
481 if (folders.Length == 0) 485 if (folders.Length == 0)
482 return null; 486 return null;