diff options
| author | Melanie | 2011-02-11 23:53:52 +0100 |
|---|---|---|
| committer | Melanie | 2011-02-11 23:53:52 +0100 |
| commit | 413f0c684801d5849d867432321228e26e4488dd (patch) | |
| tree | 2208226265a562b28eaba861d5591d5c6efb4c6a /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | Temp fix (or is it a fox?) for map weirdness (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-413f0c684801d5849d867432321228e26e4488dd.zip opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.gz opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.bz2 opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index 01a2615..66994fa 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
| @@ -139,7 +139,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
| 139 | 139 | ||
| 140 | if (scene != null) | 140 | if (scene != null) |
| 141 | { | 141 | { |
| 142 | UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, userID); | 142 | UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID)); |
| 143 | isAuthorized = IsAuthorizedForRegion(userID, account.FirstName, account.LastName, | 143 | isAuthorized = IsAuthorizedForRegion(userID, account.FirstName, account.LastName, |
| 144 | account.Email, scene.RegionInfo.RegionName, regionID, out message); | 144 | account.Email, scene.RegionInfo.RegionName, regionID, out message); |
| 145 | } | 145 | } |