aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-21 23:26:35 +0000
committerJustin Clark-Casey (justincc)2011-03-21 23:26:35 +0000
commit7acade00b9b34403e63656d5e2efc94322342653 (patch)
treed534c13b4222dcb7000373931931d3f413c4d9f9
parentIn initial setup, stop a user being able to create a new estate with the same... (diff)
downloadopensim-SC_OLD-7acade00b9b34403e63656d5e2efc94322342653.zip
opensim-SC_OLD-7acade00b9b34403e63656d5e2efc94322342653.tar.gz
opensim-SC_OLD-7acade00b9b34403e63656d5e2efc94322342653.tar.bz2
opensim-SC_OLD-7acade00b9b34403e63656d5e2efc94322342653.tar.xz
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3f5e35e..6405811 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -836,7 +836,7 @@ namespace OpenSim
836 836
837 if (regInfo.EstateSettings.EstateID == 0) // No record at all 837 if (regInfo.EstateSettings.EstateID == 0) // No record at all
838 { 838 {
839 MainConsole.Instance.Output("Your region is not part of an estate."); 839 MainConsole.Instance.OutputFormat("Region {0} is not part of an estate.", regInfo.RegionName);
840 840
841 List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll(); 841 List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
842 List<string> estateNames = new List<string>(); 842 List<string> estateNames = new List<string>();
@@ -847,8 +847,7 @@ namespace OpenSim
847 { 847 {
848 if (estates.Count == 0) 848 if (estates.Count == 0)
849 { 849 {
850 MainConsole.Instance.Output( 850 MainConsole.Instance.Output("No existing estates found. You must create a new one.");
851 "No existing estates found. You must create a new one for this region.");
852 851
853 if (CreateEstate(regInfo, estateNames)) 852 if (CreateEstate(regInfo, estateNames))
854 break; 853 break;
@@ -859,7 +858,10 @@ namespace OpenSim
859 { 858 {
860 string response 859 string response
861 = MainConsole.Instance.CmdPrompt( 860 = MainConsole.Instance.CmdPrompt(
862 "Do you wish to join an existing estate (yes/no)?", "no", new List<string>() { "yes", "no" }); 861 string.Format(
862 "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName),
863 "no",
864 new List<string>() { "yes", "no" });
863 865
864 if (response == "no") 866 if (response == "no")
865 { 867 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1a6a70b..4d2519d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1109,7 +1109,7 @@ namespace OpenSim.Region.Framework.Scenes
1109 // 1109 //
1110 while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) 1110 while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
1111 { 1111 {
1112 MainConsole.Instance.Output("The current estate has no owner set."); 1112 MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", m_regInfo.EstateSettings.EstateName);
1113 List<char> excluded = new List<char>(new char[1]{' '}); 1113 List<char> excluded = new List<char>(new char[1]{' '});
1114 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded); 1114 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
1115 string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded); 1115 string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);