diff options
| author | Melanie | 2012-11-04 22:44:42 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 22:44:42 +0000 |
| commit | c623e358057a9222e872ef648d847dfeb67852aa (patch) | |
| tree | 63f474d313e78de31e9ec8b937912e18390903ff /OpenSim/Services/HypergridService | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.zip opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.gz opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.bz2 opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/HypergridService')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 9 |
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 | ||