diff options
| author | Melanie | 2012-07-29 16:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-29 16:11:20 +0100 |
| commit | e012c81d7c883fda33edb1094dd165214804bff9 (patch) | |
| tree | 4ef031a39490ef0202a298190b5168ac99213944 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
| download | opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.zip opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.gz opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.bz2 opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index cf87010..7d1fe68 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -492,6 +492,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 492 | return null; | 492 | return null; |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | return account; | ||
| 496 | /* | ||
| 495 | try | 497 | try |
| 496 | { | 498 | { |
| 497 | string encpass = Util.Md5Hash(pass); | 499 | string encpass = Util.Md5Hash(pass); |
| @@ -512,6 +514,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 512 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message); | 514 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message); |
| 513 | return null; | 515 | return null; |
| 514 | } | 516 | } |
| 517 | */ | ||
| 515 | } | 518 | } |
| 516 | 519 | ||
| 517 | /// <summary> | 520 | /// <summary> |