diff options
author | Justin Clark-Casey (justincc) | 2013-11-15 23:10:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-11-15 23:10:59 +0000 |
commit | 346644016c529db6ed63aa866c7cf91cec1b635f (patch) | |
tree | a44a31d4bd9cedcdd446d6af3ab38f03d7eaf48f /OpenSim/Services/HypergridService | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-346644016c529db6ed63aa866c7cf91cec1b635f.zip opensim-SC_OLD-346644016c529db6ed63aa866c7cf91cec1b635f.tar.gz opensim-SC_OLD-346644016c529db6ed63aa866c7cf91cec1b635f.tar.bz2 opensim-SC_OLD-346644016c529db6ed63aa866c7cf91cec1b635f.tar.xz |
If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase folder when required, then don't try to store the null and perform other operations on it.
Patch from http://opensimulator.org/mantis/view.php?id=6844
Thanks Kira.
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 0601ece..835cde3 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -213,16 +213,23 @@ namespace OpenSim.Services.HypergridService | |||
213 | // In the DB we tag it as type 100, but we use -1 (Unknown) outside | 213 | // In the DB we tag it as type 100, but we use -1 (Unknown) outside |
214 | suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase"); | 214 | suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase"); |
215 | if (suitcase == null) | 215 | if (suitcase == null) |
216 | { | ||
216 | m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder"); | 217 | m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder"); |
217 | m_Database.StoreFolder(suitcase); | 218 | } |
219 | else | ||
220 | { | ||
221 | m_Database.StoreFolder(suitcase); | ||
218 | 222 | ||
219 | // Create System folders | 223 | // Create System folders |
220 | CreateSystemFolders(principalID, suitcase.folderID); | 224 | CreateSystemFolders(principalID, suitcase.folderID); |
221 | } | ||
222 | 225 | ||
223 | SetAsNormalFolder(suitcase); | 226 | SetAsNormalFolder(suitcase); |
224 | 227 | ||
225 | return ConvertToOpenSim(suitcase); | 228 | return ConvertToOpenSim(suitcase); |
229 | } | ||
230 | } | ||
231 | |||
232 | return null; | ||
226 | } | 233 | } |
227 | 234 | ||
228 | protected void CreateSystemFolders(UUID principalID, UUID rootID) | 235 | protected void CreateSystemFolders(UUID principalID, UUID rootID) |