try to configure maptile for each region

To be used only on first time Estate Creation

Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>

OpenSim/Region/Application/OpenSimBase.cs

@@ -443,10 +443,39 @@ namespace OpenSim
         {
             RegionInfo regionInfo = scene.RegionInfo;
 
+            string estateFirstName = "", estateLastName = "", estateOwnerEMail = "", estateOwnerPassword = "", estateOwnerUUID = "";
+
+            if (m_config.Source.Configs["EstateDefaults"] != null)
+            {
+                string estateOwner = m_config.Source.Configs["EstateDefaults"].GetString("EstateOwner", "").Trim();
+                string[] ownerNames = estateOwner.Split(' ');
+
+                if (ownerNames.Length == 2)
+                {
+                    estateFirstName = ownerNames[0];
+                    estateLastName = ownerNames[1];
+                }
+                // Info to be used only on Standalone Mode
+                estateOwnerUUID = m_config.Source.Configs["EstateDefaults"].GetString("estateOwnerUUID", "");
+                estateOwnerEMail = m_config.Source.Configs["EstateDefaults"].GetString("estateOwnerEMail", "");
+                estateOwnerPassword = m_config.Source.Configs["EstateDefaults"].GetString("estateOwnerPassword", "");
+            }
+
             MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName);
             List<char> excluded = new List<char>(new char[1]{' '});
-            string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
-            string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);
+
+            string first, last;
+
+            if ((estateFirstName != "") && (estateLastName != ""))
+            {
+                first = estateFirstName;
+                last = estateLastName;
+            }
+            else
+            {
+                first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
+                last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);
+            }
 
             UserAccount account = scene.UserAccountService.GetUserAccount(regionInfo.ScopeID, first, last);
 
@@ -467,10 +496,22 @@ namespace OpenSim
 
                 if (scene.UserAccountService is UserAccountService)
                 {
-                    string password = MainConsole.Instance.PasswdPrompt("Password");
-                    string email = MainConsole.Instance.CmdPrompt("Email", "");
+                    string password = "", email = "", rawPrincipalId = "";
 
-                    string rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
+                    if (estateOwnerPassword != "")
+                        password = estateOwnerPassword;
+                    else
+                        MainConsole.Instance.PasswdPrompt("Password");
+
+                    if (estateOwnerEMail != "")
+                        email = estateOwnerEMail;
+                    else
+                        email = MainConsole.Instance.CmdPrompt("Email", "");
+
+                    if (estateOwnerUUID != "")
+                        rawPrincipalId = estateOwnerUUID;
+                    else
+                        rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
         
                     UUID principalId = UUID.Zero;
                     if (!UUID.TryParse(rawPrincipalId, out principalId))
@@ -885,11 +926,20 @@ namespace OpenSim
         /// <param name="regInfo"></param>
         /// <param name="existingName">A list of estate names that already exist.</param>
         /// <returns>true if the estate was created, false otherwise</returns>
-        public bool CreateEstate(RegionInfo regInfo, List<string> existingNames)
+        public bool CreateEstate(RegionInfo regInfo, List<string> existingNames, string estateName)
         {
             // Create a new estate
             regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
-            string newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
+
+            string newName;
+            if (estateName != "")
+            {
+                newName = estateName;
+            }
+            else
+            {
+                newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
+            }
 
             if (existingNames.Contains(newName))
             {
@@ -925,18 +975,30 @@ namespace OpenSim
                 List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();                
                 List<string> estateNames = new List<string>();
                 foreach (EstateSettings estate in estates)
-                    estateNames.Add(estate.EstateName);                
-                
+                    estateNames.Add(estate.EstateName);
+
+                string estateName = "";
+                string estateOwner = "";
+
+                if (m_config.Source.Configs["EstateDefaults"] != null)
+                {
+                    estateName = m_config.Source.Configs["EstateDefaults"].GetString("EstateName", "");
+                    estateOwner = m_config.Source.Configs["EstateDefaults"].GetString("EstateOwner", "");
+                }
+                    
                 while (true)
                 {
                     if (estates.Count == 0)
                     {                        
                         m_log.Info("[ESTATE] No existing estates found.  You must create a new one.");
-                        
-                        if (CreateEstate(regInfo, estateNames))
-                            break;                        
+
+                        if (CreateEstate(regInfo, estateNames, estateName))
+                            break;
                         else
+                        {
+                            estateName = "";
                             continue;
+                        }
                     }
                     else
                     {
@@ -949,10 +1011,13 @@ namespace OpenSim
                         
                         if (response == "no")
                         {
-                            if (CreateEstate(regInfo, estateNames))                            
+                            if (CreateEstate(regInfo, estateNames, estateName))
                                 break;
                             else
+                            {
+                                estateName = "";
                                 continue;
+                            }
                         }
                         else
                         {                           

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -704,6 +704,13 @@ namespace OpenSim.Region.Framework.Scenes
                     string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
                     UUID tileID;
 
+                    if (config.Configs[RegionInfo.RegionName].Contains("MaptileStaticUUID"))
+                    {
+                        m_log.Info("[SCENE]: MaptileStaticUUID for " + RegionInfo.RegionName);
+                        tile = config.Configs[RegionInfo.RegionName].GetString("MaptileStaticUUID", UUID.Zero.ToString());
+                        m_log.Info("[SCENE]: MaptileStaticUUID " + tile);
+                    }
+
                     if (UUID.TryParse(tile, out tileID))
                     {
                         RegionInfo.RegionSettings.TerrainImageID = tileID;

syncneb.bat

@@ -0,0 +1,3 @@
+rem git remote add upstream git://github.com/nebadon2025/opensimulator.git
+git fetch upstream
+git merge upstream/master