diff options
| author | Diva Canto | 2009-09-11 06:59:10 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-11 06:59:10 -0700 |
| commit | ca0810a1036f54f61cd92ab9356de538f4783e2c (patch) | |
| tree | 9a4d03371d76848dd51545b572f20f9a334e3553 /OpenSim | |
| parent | Changed RemoteAuthorizationServiceConnector so that it implements the IAuthor... (diff) | |
| download | opensim-SC-ca0810a1036f54f61cd92ab9356de538f4783e2c.zip opensim-SC-ca0810a1036f54f61cd92ab9356de538f4783e2c.tar.gz opensim-SC-ca0810a1036f54f61cd92ab9356de538f4783e2c.tar.bz2 opensim-SC-ca0810a1036f54f61cd92ab9356de538f4783e2c.tar.xz | |
Minor indentation cleanup.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index 88e6ee2..ac8b566 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
| @@ -136,10 +136,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
| 136 | } | 136 | } |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | if(scene!=null) | 139 | if(scene != null) |
| 140 | { | 140 | { |
| 141 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); | 141 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); |
| 142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName,profile.Email,scene.RegionInfo.RegionName,regionID); | 142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, |
| 143 | profile.Email, scene.RegionInfo.RegionName, regionID); | ||
| 143 | } | 144 | } |
| 144 | else | 145 | else |
| 145 | { | 146 | { |
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs index bc4daad..98309f1 100644 --- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs | |||
| @@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors | |||
| 88 | m_ResponseOnFailure = responseOnFailure; | 88 | m_ResponseOnFailure = responseOnFailure; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | public bool IsAuthorizedForRegion(string userID,string firstname, string surname, string email, string regionName, string regionID) | 91 | public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID) |
| 92 | { | 92 | { |
| 93 | // do a remote call to the authorization server specified in the AuthorizationServerURI | 93 | // do a remote call to the authorization server specified in the AuthorizationServerURI |
| 94 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); | 94 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); |