aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-11-03 12:03:47 -0700
committerDiva Canto2012-11-03 12:03:47 -0700
commit783443705da92c2ebc85c7999d11ef79d014dd73 (patch)
tree3b007f4863d33221294df34e9417a9964d92365b /OpenSim
parentHG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ... (diff)
downloadopensim-SC_OLD-783443705da92c2ebc85c7999d11ef79d014dd73.zip
opensim-SC_OLD-783443705da92c2ebc85c7999d11ef79d014dd73.tar.gz
opensim-SC_OLD-783443705da92c2ebc85c7999d11ef79d014dd73.tar.bz2
opensim-SC_OLD-783443705da92c2ebc85c7999d11ef79d014dd73.tar.xz
HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder with parentID=UUID.Zero
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 677bd7b..784f136 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -460,6 +460,15 @@ namespace OpenSim.Services.HypergridService
460 460
461 if (folders != null && folders.Length > 0) 461 if (folders != null && folders.Length > 0)
462 return folders[0]; 462 return folders[0];
463
464 // OK, so the RootFolder type didn't work. Let's look for any type with parent UUID.Zero.
465 folders = m_Database.GetFolders(
466 new string[] { "agentID", "folderName", "parentFolderID" },
467 new string[] { principalID.ToString(), "My Inventory", UUID.Zero.ToString() });
468
469 if (folders != null && folders.Length > 0)
470 return folders[0];
471
463 return null; 472 return null;
464 } 473 }
465 474