From 7f027552ecd604977faa1d23ff17e1b619cbeaa6 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 20 Mar 2014 20:36:47 +0000 Subject: If we find an existing suitcase folder in HGSuitcaseInventoryService.GetRootFolder(), then return that as a response rather than null. Fixes a regression from commit 346644016c529db6ed63aa866c7cf91cec1b635f (Fri Nov 15 23:10:59 2013) This is actually the reverse of zadark's patch in http://opensimulator.org/mantis/view.php?id=6969 But I'm assuming that was a mistake since clearly we should be returning this data - this was original behaviour --- OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 835cde3..90ce44a 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs @@ -228,6 +228,10 @@ namespace OpenSim.Services.HypergridService return ConvertToOpenSim(suitcase); } } + else + { + return ConvertToOpenSim(suitcase); + } return null; } -- cgit v1.1