diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Region/Communications/Hypergrid | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index 49a2261..09d8285 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
| @@ -204,6 +204,14 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 204 | return base.UpdateUserProfile(userProfile); | 204 | return base.UpdateUserProfile(userProfile); |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | public override bool AuthenticateUserByPassword(UUID userID, string password) | ||
| 208 | { | ||
| 209 | if (m_localUserServices != null) | ||
| 210 | return m_localUserServices.AuthenticateUserByPassword(userID, password); | ||
| 211 | else | ||
| 212 | return base.AuthenticateUserByPassword(userID, password); | ||
| 213 | } | ||
| 214 | |||
| 207 | #region IUserServices Friend Methods | 215 | #region IUserServices Friend Methods |
| 208 | 216 | ||
| 209 | // NOTE: We're still not dealing with foreign user friends | 217 | // NOTE: We're still not dealing with foreign user friends |