OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge

avinationmerge
Melanie 2011-10-11 22:54:03 +01:00
parent 308b6937ad c14c4bc1ec
commit ed1bb2081e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
View File

@ -141,11 +141,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
if (scene != null) if (scene != null)
{ {
string mail = String.Empty;
UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID)); 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 isAuthorized
= IsAuthorizedForRegion( = IsAuthorizedForRegion(
userID, firstName, lastName, account.Email, scene.RegionInfo.RegionName, regionID, out message); userID, firstName, lastName, mail, scene.RegionInfo.RegionName, regionID, out message);
} }
else else
{ {