diff options
| author | Diva Canto | 2010-01-07 15:53:55 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-07 15:53:55 -0800 |
| commit | f11a97f12d328af8bb39b92fec5cb5780983b66a (patch) | |
| tree | 00f96f853b91e105786b416dd18f2c76e56fd1fd /OpenSim/Region/CoreModules/Avatar/Inventory | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC-f11a97f12d328af8bb39b92fec5cb5780983b66a.zip opensim-SC-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.gz opensim-SC-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.bz2 opensim-SC-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.xz | |
* Finished SimulationServiceConnector
* Started rerouting calls to UserService.
* Compiles. May run.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index ecd60bd..6da43a8 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -335,7 +335,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 335 | 335 | ||
| 336 | try | 336 | try |
| 337 | { | 337 | { |
| 338 | if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) | 338 | if (m_aScene.AuthenticationService.Authenticate(userInfo.UserProfile.ID, pass, 1) != string.Empty) |
| 339 | { | 339 | { |
| 340 | return userInfo; | 340 | return userInfo; |
| 341 | } | 341 | } |