* Apply http://opensimulator.org/mantis/view.php?id=2810

* Fix set up of master avatar on a fresh OpenSim install
* Turns out we had started hashing the password too many times.  Thanks jonc!

1 files changed, 1 insertions, 2 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index cac68d9..a53bfbe 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -521,8 +521,7 @@ namespace OpenSim.Framework
                     MasterAvatarLastName = (string) configuration_result;
                     break;
                 case "master_avatar_pass":
-                    string tempMD5Passwd = (string) configuration_result;
-                    MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
+                    MasterAvatarSandboxPassword = (string)configuration_result;
                     break;
                 case "lastmap_uuid":
                     lastMapUUID = (UUID)configuration_result;