From 90466515839eb34d7fd9984c92f1970ab5d6f3ad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Sep 2011 00:36:43 +0100
Subject: Pass any region scope through to the CreateUser() method

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

(limited to 'OpenSim/Region/Application/OpenSimBase.cs')

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8662ea8..54caac4 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -422,6 +422,14 @@ namespace OpenSim
             return clientServer;
         }
 
+        /// <summary>
+        /// Try to set up the estate owner for the given scene.
+        /// </summary>
+        /// <remarks>
+        /// The involves asking the user for information about the user on the console.  If the user does not already
+        /// exist then it is created.
+        /// </remarks>
+        /// <param name="scene"></param>
         private void SetUpEstateOwner(Scene scene)
         {
             RegionInfo regionInfo = scene.RegionInfo;
@@ -453,8 +461,9 @@ namespace OpenSim
                     string password = MainConsole.Instance.PasswdPrompt("Password");
                     string email = MainConsole.Instance.CmdPrompt("Email", "");
 
-                    // TODO: Where do we put m_regInfo.ScopeID?
-                    account = ((UserAccountService)scene.UserAccountService).CreateUser(first, last, password, email);
+                    account
+                        = ((UserAccountService)scene.UserAccountService).CreateUser(
+                            regionInfo.ScopeID, first, last, password, email);
                 }
 //                    }
             }
-- 
cgit v1.1