aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-07-24 11:38:30 +0200
committerMelanie2012-07-24 11:38:30 +0200
commit0993af08718eaf6956facd3f2ee77cef602de259 (patch)
tree12e01869ec93a711a68d3cf70eaf83a00dbc332b /OpenSim/Region
parentChange attachment handling to remove object from the scene first as per (diff)
downloadopensim-SC-0993af08718eaf6956facd3f2ee77cef602de259.zip
opensim-SC-0993af08718eaf6956facd3f2ee77cef602de259.tar.gz
opensim-SC-0993af08718eaf6956facd3f2ee77cef602de259.tar.bz2
opensim-SC-0993af08718eaf6956facd3f2ee77cef602de259.tar.xz
Allow load and save of IAR without a password. The password must still be
present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs3
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>