diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 797097f..5854428 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
536 | } | 536 | } |
537 | catch (Exception e) | 537 | catch (Exception e) |
538 | { | 538 | { |
539 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message); | 539 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e); |
540 | return null; | 540 | return null; |
541 | } | 541 | } |
542 | } | 542 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cb12d65..d547323 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3824,7 +3824,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3824 | 3824 | ||
3825 | try | 3825 | try |
3826 | { | 3826 | { |
3827 | if (!AuthorizeUser(acd, SeeIntoRegion, out reason)) | 3827 | if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason)) |
3828 | { | 3828 | { |
3829 | m_authenticateHandler.RemoveCircuit(acd.circuitcode); | 3829 | m_authenticateHandler.RemoveCircuit(acd.circuitcode); |
3830 | return false; | 3830 | return false; |