From b51a900bebe914650c1c7db7b77f74c5ac107f6d Mon Sep 17 00:00:00 2001
From: mingchen
Date: Sat, 3 Nov 2007 17:49:45 +0000
Subject: *Master Avatar can be specified by a previous UUID in either grid
 mode or standalone mode by specifying a master_avatar_uuid attribute in the
 place of master_avatar_xxxx_name and master_avatar_password.You will not be
 asked for the name and password if a valid UUID is specified.

---
 OpenSim/Region/ClientStack/RegionApplicationBase.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 7551bff..6071dcd 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -113,10 +113,19 @@ namespace OpenSim.Region.ClientStack
             scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
 
             //Master Avatar Setup
-            UserProfileData masterAvatar =
-                m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
+            UserProfileData masterAvatar;
+            if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
+            {
+                masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
+            }
+            else
+            {
+                masterAvatar =
+                    m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
                                                            scene.RegionInfo.MasterAvatarLastName,
                                                            scene.RegionInfo.MasterAvatarSandboxPassword);
+            }
+
             if (masterAvatar != null)
             {
                 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
-- 
cgit v1.1