diff options
author | Oren Hurvitz | 2014-05-18 18:52:57 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-05-19 11:12:53 +0100 |
commit | 78733b979fa2f34ef0a0066fc019cb698239e9f5 (patch) | |
tree | 27d8893d902a490a910a77c70e4c525297741cf6 /OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |
parent | Return more specific error messages if an attempt to enter a region fails due... (diff) | |
download | opensim-SC_OLD-78733b979fa2f34ef0a0066fc019cb698239e9f5.zip opensim-SC_OLD-78733b979fa2f34ef0a0066fc019cb698239e9f5.tar.gz opensim-SC_OLD-78733b979fa2f34ef0a0066fc019cb698239e9f5.tar.bz2 opensim-SC_OLD-78733b979fa2f34ef0a0066fc019cb698239e9f5.tar.xz |
Log the user when an inventory operation is blocked because the item/folder isn't in the Suitcase
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 4416995..649e66c 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -249,7 +249,7 @@ namespace OpenSim.Services.HypergridService | |||
249 | 249 | ||
250 | if (!IsWithinSuitcaseTree(principalID, folderID)) | 250 | if (!IsWithinSuitcaseTree(principalID, folderID)) |
251 | { | 251 | { |
252 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderContent: folder {0} is not within Suitcase tree", folderID); | 252 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderContent: folder {0} (user {1}) is not within Suitcase tree", folderID, principalID); |
253 | return new InventoryCollection(); | 253 | return new InventoryCollection(); |
254 | } | 254 | } |
255 | 255 | ||
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService | |||
269 | // make sure the given folder exists under the suitcase tree of this user | 269 | // make sure the given folder exists under the suitcase tree of this user |
270 | if (!IsWithinSuitcaseTree(principalID, folderID)) | 270 | if (!IsWithinSuitcaseTree(principalID, folderID)) |
271 | { | 271 | { |
272 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderItems: folder {0} is not within Suitcase tree", folderID); | 272 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolderItems: folder {0} (user {1}) is not within Suitcase tree", folderID, principalID); |
273 | return new List<InventoryItemBase>(); | 273 | return new List<InventoryItemBase>(); |
274 | } | 274 | } |
275 | 275 | ||
@@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService | |||
284 | 284 | ||
285 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) | 285 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) |
286 | { | 286 | { |
287 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder: folder {0} is not within Suitcase tree", folder.ParentID); | 287 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); |
288 | return false; | 288 | return false; |
289 | } | 289 | } |
290 | 290 | ||
@@ -306,7 +306,7 @@ namespace OpenSim.Services.HypergridService | |||
306 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version); | 306 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version); |
307 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ID)) | 307 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ID)) |
308 | { | 308 | { |
309 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateFolder: folder {0}/{1} is not within Suitcase tree", folder.Name, folder.ID); | 309 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateFolder: folder {0}/{1} (user {2}) is not within Suitcase tree", folder.Name, folder.ID, folder.Owner); |
310 | return false; | 310 | return false; |
311 | } | 311 | } |
312 | 312 | ||
@@ -318,13 +318,13 @@ namespace OpenSim.Services.HypergridService | |||
318 | { | 318 | { |
319 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ID)) | 319 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ID)) |
320 | { | 320 | { |
321 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} is not within Suitcase tree", folder.ID); | 321 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner); |
322 | return false; | 322 | return false; |
323 | } | 323 | } |
324 | 324 | ||
325 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) | 325 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) |
326 | { | 326 | { |
327 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} is not within Suitcase tree", folder.ParentID); | 327 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); |
328 | return false; | 328 | return false; |
329 | } | 329 | } |
330 | 330 | ||
@@ -349,7 +349,7 @@ namespace OpenSim.Services.HypergridService | |||
349 | // make sure the given folder's parent folder exists under the suitcase tree of this user | 349 | // make sure the given folder's parent folder exists under the suitcase tree of this user |
350 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) | 350 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) |
351 | { | 351 | { |
352 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddItem: folder {0} is not within Suitcase tree", item.Folder); | 352 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: AddItem: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner); |
353 | return false; | 353 | return false; |
354 | } | 354 | } |
355 | 355 | ||
@@ -362,7 +362,7 @@ namespace OpenSim.Services.HypergridService | |||
362 | { | 362 | { |
363 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) | 363 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) |
364 | { | 364 | { |
365 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateItem: folder {0} is not within Suitcase tree", item.Folder); | 365 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: UpdateItem: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner); |
366 | return false; | 366 | return false; |
367 | } | 367 | } |
368 | 368 | ||
@@ -378,7 +378,7 @@ namespace OpenSim.Services.HypergridService | |||
378 | { | 378 | { |
379 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) | 379 | if (!IsWithinSuitcaseTree(item.Owner, item.Folder)) |
380 | { | 380 | { |
381 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} is not within Suitcase tree", item.Folder); | 381 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner); |
382 | return false; | 382 | return false; |
383 | } | 383 | } |
384 | } | 384 | } |
@@ -389,7 +389,7 @@ namespace OpenSim.Services.HypergridService | |||
389 | InventoryItemBase originalItem = base.GetItem(item); | 389 | InventoryItemBase originalItem = base.GetItem(item); |
390 | if (!IsWithinSuitcaseTree(originalItem.Owner, originalItem.Folder)) | 390 | if (!IsWithinSuitcaseTree(originalItem.Owner, originalItem.Folder)) |
391 | { | 391 | { |
392 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} is not within Suitcase tree", originalItem.Folder); | 392 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner); |
393 | return false; | 393 | return false; |
394 | } | 394 | } |
395 | } | 395 | } |
@@ -414,8 +414,8 @@ namespace OpenSim.Services.HypergridService | |||
414 | 414 | ||
415 | if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID)) | 415 | if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID)) |
416 | { | 416 | { |
417 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Item {0}/{1} (folder {2}) is not within Suitcase tree or Appearance", | 417 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetItem: item {0}/{1} (folder {2}) (user {3}) is not within Suitcase tree or Appearance", |
418 | it.Name, it.ID, it.Folder); | 418 | it.Name, it.ID, it.Folder, it.Owner); |
419 | return null; | 419 | return null; |
420 | } | 420 | } |
421 | 421 | ||
@@ -437,8 +437,8 @@ namespace OpenSim.Services.HypergridService | |||
437 | { | 437 | { |
438 | if (!IsWithinSuitcaseTree(f.Owner, f.ID)) | 438 | if (!IsWithinSuitcaseTree(f.Owner, f.ID)) |
439 | { | 439 | { |
440 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Folder {0}/{1} is not within Suitcase tree", | 440 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetFolder: folder {0}/{1} (user {2}) is not within Suitcase tree", |
441 | f.Name, f.ID); | 441 | f.Name, f.ID, f.Owner); |
442 | return null; | 442 | return null; |
443 | } | 443 | } |
444 | } | 444 | } |