diff options
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 326e68d..3233caf 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -298,7 +298,7 @@ namespace OpenSim.Services.HypergridService | |||
298 | UserAccount user = m_Cache.GetUser(it.CreatorId); | 298 | UserAccount user = m_Cache.GetUser(it.CreatorId); |
299 | 299 | ||
300 | // Adjust the creator data | 300 | // Adjust the creator data |
301 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) | 301 | if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData)) |
302 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; | 302 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; |
303 | } | 303 | } |
304 | return it; | 304 | return it; |
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) |