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/Communications/Local/LocalUserServices.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'OpenSim/Region/Communications/Local/LocalUserServices.cs')

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7687c7..d8c4b1d 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -81,5 +81,15 @@ namespace OpenSim.Region.Communications.Local
 
             return profile;
         }
+
+        public override UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid)
+        {
+            UserProfileData data = GetUserProfile(uuid);
+            if (data == null)
+            {
+                throw new Exception("Unknown master user UUID");
+            }
+            return data;
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1