* refactor: Move error logging from GetUserDetails up to callers, since there are some circumstances in which not finding a user is not an error

3 files changed, 36 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
index 5484ad5..2763831 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -244,6 +244,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
 
                     userInfo.UpdateItem(item);
                 }
+                else
+                {
+                    m_log.ErrorFormat(
+                        "[ASSET TRANSACTIONS]: Could not find user {0} for inventory item update", 
+                        remoteClient.AgentId);                    
+                }                    
             }
         }
         
@@ -294,6 +300,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                 userInfo.AddItem(item);
                 ourClient.SendInventoryItemCreateUpdate(item);
             }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[ASSET TRANSACTIONS]: Could not find user {0} for inventory item creation", 
+                    ourClient.AgentId);
+            }                  
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index a015c63..1f57fb5 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -604,6 +604,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
                 string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName;
                 return avatarname;
             }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[MONEY]: Could not resolve user {0}", 
+                    agentID);
+            }
+            
             return String.Empty;
         }
 
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index abbf40e..b6a0c23 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -259,6 +259,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                     if (profile.UserProfile.GodLevel >= 200)
                         return true;
                 }
+                else
+                {
+                    m_log.ErrorFormat("[PERMISSIONS]: Could not find user {0} for administrator check", user);
+                }
             }
 
             return false;
@@ -646,8 +650,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 {
                     CachedUserInfo userInfo =
                             scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
+                
                     if (userInfo == null)
+                    {
+                        m_log.ErrorFormat("[PERMISSIONS]: Could not find user {0} for edit notecard check", user);
                         return false;
+                    }                    
+                
 
                     if (userInfo.RootFolder == null)
                         return false;
@@ -1024,8 +1033,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 {
                     CachedUserInfo userInfo =
                             scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
+                
                     if (userInfo == null)
+                    {
+                        m_log.ErrorFormat("[PERMISSIONS]: Could not find user {0} for administrator check", user);
                         return false;
+                    }    
 
                     if (userInfo.RootFolder == null)
                         return false;
@@ -1102,8 +1115,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 {
                     CachedUserInfo userInfo =
                             scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
+                
                     if (userInfo == null)
+                    {
+                        m_log.ErrorFormat("[PERMISSIONS]: Could not find user {0} for view notecard check", user);
                         return false;
+                    }    
 
                     if (userInfo.RootFolder == null)
                         return false;