diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-13 07:28:08 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-13 07:28:08 -0400 |
| commit | fe4f312d55363841f28d6cde84bf645b8c6dd080 (patch) | |
| tree | e688d73b0a2e7198311601b40e8cd576c3ae15b3 /OpenSim/Region/CoreModules | |
| parent | * Milestone GridFriendly reached so Adding CombineContiguousRegions to the Op... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.zip opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.gz opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.bz2 opensim-SC_OLD-fe4f312d55363841f28d6cde84bf645b8c6dd080.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 ac8b566..9241851 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
| @@ -136,7 +136,7 @@ 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, | 142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, |