diff options
| author | Diva Canto | 2010-01-10 15:34:56 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:34:56 -0800 |
| commit | 4dd523b45d1e635c66eb4e556764fabe29dbfc58 (patch) | |
| tree | dbd92b59418535e6c2967021124a906a9987088d /OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |
| parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
| download | opensim-SC_OLD-4dd523b45d1e635c66eb4e556764fabe29dbfc58.zip opensim-SC_OLD-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.gz opensim-SC_OLD-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.bz2 opensim-SC_OLD-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.xz | |
* Changed IPresenceService Logout, so that it takes a position and a lookat
* CommsManager.AvatarService rerouted
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index fa3681a..10ab76f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
| @@ -781,13 +781,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
| 781 | ipaddr = Util.GetHostFromDNS(parts[0]); | 781 | ipaddr = Util.GetHostFromDNS(parts[0]); |
| 782 | if (parts.Length == 2) | 782 | if (parts.Length == 2) |
| 783 | UInt32.TryParse(parts[1], out port); | 783 | UInt32.TryParse(parts[1], out port); |
| 784 | 784 | return true; | |
| 785 | // local authority (standalone), local call | 785 | |
| 786 | if (m_thisIP.Equals(ipaddr) && (m_aScene.RegionInfo.HttpPort == port)) | 786 | //// local authority (standalone), local call |
| 787 | return ((IAuthentication)m_aScene.CommsManager.UserAdminService).VerifyKey(userID, key); | 787 | //if (m_thisIP.Equals(ipaddr) && (m_aScene.RegionInfo.HttpPort == port)) |
| 788 | // remote call | 788 | // return ((IAuthentication)m_aScene.CommsManager.UserAdminService).VerifyKey(userID, key); |
| 789 | else | 789 | //// remote call |
| 790 | return AuthClient.VerifyKey("http://" + authority, userID, key); | 790 | //else |
| 791 | // return AuthClient.VerifyKey("http://" + authority, userID, key); | ||
| 791 | } | 792 | } |
| 792 | 793 | ||
| 793 | 794 | ||