diff options
author | Justin Clarke Casey | 2008-02-11 21:58:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-02-11 21:58:58 +0000 |
commit | 7647239f3244a34e5537392c783b892d24df625e (patch) | |
tree | e49b3d0d0d28645b5350b2b96d30db325c472050 /OpenSim/Region | |
parent | Re-enabled Inventory creation of body parts (diff) | |
download | opensim-SC-7647239f3244a34e5537392c783b892d24df625e.zip opensim-SC-7647239f3244a34e5537392c783b892d24df625e.tar.gz opensim-SC-7647239f3244a34e5537392c783b892d24df625e.tar.bz2 opensim-SC-7647239f3244a34e5537392c783b892d24df625e.tar.xz |
Tiny change to print out a warning in a situation which almost guaranteeably never occurs anyway
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 16f15a2..bed85aa 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
42 | { | 42 | { |
43 | public partial class Scene | 43 | public partial class Scene |
44 | { | 44 | { |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly log4net.ILog m_log |
46 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | 47 | ||
47 | /// <summary> | 48 | /// <summary> |
48 | /// Start all the scripts in the scene which should be started. | 49 | /// Start all the scripts in the scene which should be started. |
@@ -404,10 +405,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
404 | } | 405 | } |
405 | } | 406 | } |
406 | 407 | ||
408 | /// <summary> | ||
409 | /// Create a new inventory item. | ||
410 | /// </summary> | ||
411 | /// <param name="remoteClient"></param> | ||
412 | /// <param name="folderID"></param> | ||
413 | /// <param name="callbackID"></param> | ||
414 | /// <param name="asset"></param> | ||
415 | /// <param name="nextOwnerMask"></param> | ||
407 | private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, | 416 | private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, |
408 | AssetBase asset, uint nextOwnerMask) | 417 | AssetBase asset, uint nextOwnerMask) |
409 | { | 418 | { |
410 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); | 419 | CachedUserInfo userInfo |
420 | = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); | ||
421 | |||
411 | if (userInfo != null) | 422 | if (userInfo != null) |
412 | { | 423 | { |
413 | InventoryItemBase item = new InventoryItemBase(); | 424 | InventoryItemBase item = new InventoryItemBase(); |
@@ -426,10 +437,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
426 | userInfo.AddItem(remoteClient.AgentId, item); | 437 | userInfo.AddItem(remoteClient.AgentId, item); |
427 | remoteClient.SendInventoryItemCreateUpdate(item); | 438 | remoteClient.SendInventoryItemCreateUpdate(item); |
428 | } | 439 | } |
440 | else | ||
441 | { | ||
442 | m_log.WarnFormat( | ||
443 | "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!", | ||
444 | remoteClient.Name, remoteClient.AgentId); | ||
445 | } | ||
429 | } | 446 | } |
430 | 447 | ||
431 | /// <summary> | 448 | /// <summary> |
432 | /// temporary method to test out creating new inventory items | 449 | /// Create a new inventory item. |
433 | /// </summary> | 450 | /// </summary> |
434 | /// <param name="remoteClient"></param> | 451 | /// <param name="remoteClient"></param> |
435 | /// <param name="transActionID"></param> | 452 | /// <param name="transActionID"></param> |