ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

On initial setup, include estate and regions names in questions to make it clearer what they relate to.

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2011-03-21 23:26:35 +00:00
parent 3382de4d8b
commit 7acade00b9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -836,7 +836,7 @@ namespace OpenSim
if (regInfo.EstateSettings.EstateID == 0) // No record at all
{
MainConsole.Instance.Output("Your region is not part of an estate.");
MainConsole.Instance.OutputFormat("Region {0} is not part of an estate.", regInfo.RegionName);
List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
List<string> estateNames = new List<string>();
@@ -847,8 +847,7 @@ namespace OpenSim
{
if (estates.Count == 0)
{
MainConsole.Instance.Output(
"No existing estates found. You must create a new one for this region.");
MainConsole.Instance.Output("No existing estates found. You must create a new one.");
if (CreateEstate(regInfo, estateNames))
break;
@@ -859,7 +858,10 @@ namespace OpenSim
{
string response
= MainConsole.Instance.CmdPrompt(
"Do you wish to join an existing estate (yes/no)?", "no", new List<string>() { "yes", "no" });
string.Format(
"Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName),
"no",
new List<string>() { "yes", "no" });
if (response == "no")
{