diff options
| author | UbitUmarov | 2016-11-03 14:01:35 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-03 14:01:35 +0000 |
| commit | 01a4a883e08f681c48fbb3d456a773f93985f694 (patch) | |
| tree | 30a9aef2876644413e56e22ff50088904bab8e53 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix some coments, thanks Austin Tate (diff) | |
| download | opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.zip opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.gz opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.bz2 opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 8d11d20..8847414 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -565,8 +565,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 565 | return null; | 565 | return null; |
| 566 | } | 566 | } |
| 567 | 567 | ||
| 568 | return account; | ||
| 569 | /* | ||
| 570 | try | 568 | try |
| 571 | { | 569 | { |
| 572 | string encpass = Util.Md5Hash(pass); | 570 | string encpass = Util.Md5Hash(pass); |
| @@ -587,7 +585,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 587 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e); | 585 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e); |
| 588 | return null; | 586 | return null; |
| 589 | } | 587 | } |
| 590 | */ | ||
| 591 | } | 588 | } |
| 592 | 589 | ||
| 593 | /// <summary> | 590 | /// <summary> |