aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-20 20:36:47 +0000
committerJustin Clark-Casey (justincc)2014-03-20 20:36:47 +0000
commit7f027552ecd604977faa1d23ff17e1b619cbeaa6 (patch)
treeaccacc233895e359e78faca94571b319e4b1edd9
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-7f027552ecd604977faa1d23ff17e1b619cbeaa6.zip
opensim-SC-7f027552ecd604977faa1d23ff17e1b619cbeaa6.tar.gz
opensim-SC-7f027552ecd604977faa1d23ff17e1b619cbeaa6.tar.bz2
opensim-SC-7f027552ecd604977faa1d23ff17e1b619cbeaa6.tar.xz
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
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs4
1 files changed, 4 insertions, 0 deletions
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
228 return ConvertToOpenSim(suitcase); 228 return ConvertToOpenSim(suitcase);
229 } 229 }
230 } 230 }
231 else
232 {
233 return ConvertToOpenSim(suitcase);
234 }
231 235
232 return null; 236 return null;
233 } 237 }