Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge

1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index 003324f..86c0099 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -141,11 +141,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
             
             if (scene != null)
             {
+                string mail = String.Empty;
+                
                 UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID));
 
+                //if account not found, we assume its a foreign visitor from HG, else use account data...
+                if (account != null)
+                {
+                    mail = account.Email;
+                    firstName = account.FirstName;
+                    lastName = account.LastName;
+                }
+
                 isAuthorized
                     = IsAuthorizedForRegion(
-                        userID, firstName, lastName, account.Email, scene.RegionInfo.RegionName, regionID, out message);
+                        userID, firstName, lastName, mail, scene.RegionInfo.RegionName, regionID, out message);
             }
             else
             {