OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/) 

Also convert some tabs into spaces.
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-09-11 00:27:52 +01:00
parent 30306a775a
commit 220f82a0f0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Application/OpenSim.cs
View File

@ -316,7 +316,7 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "create region", m_console.Commands.AddCommand("region", false, "create region",
"create region [\"region name\"] <region_file.ini>", "create region [\"region name\"] <region_file.ini>",
"Create a new region.", "Create a new region.",
"The settings for \"region name\" are read from <region_file.ini>." "The settings for \"region name\" are read from <region_file.ini> in your Regions directory."
+ " If \"region name\" does not exist in <region_file.ini>, it will be added." + Environment.NewLine + " If \"region name\" does not exist in <region_file.ini>, it will be added." + Environment.NewLine
+ "Without \"region name\", the first region found in <region_file.ini> will be created." + Environment.NewLine + "Without \"region name\", the first region found in <region_file.ini> will be created." + Environment.NewLine
+ "If <region_file.ini> does not exist, it will be created.", + "If <region_file.ini> does not exist, it will be created.",
@ -552,17 +552,18 @@ namespace OpenSim
regionFile = Path.Combine(regionsDir, regionFile); regionFile = Path.Combine(regionsDir, regionFile);
} }
RegionInfo regInfo; RegionInfo regInfo;
if (isXml) if (isXml)
{ {
regInfo = new RegionInfo(regionName, regionFile, false, ConfigSource.Source); regInfo = new RegionInfo(regionName, regionFile, false, ConfigSource.Source);
} }
else else
{ {
regInfo = new RegionInfo(regionName, regionFile, false, ConfigSource.Source, regionName); regInfo = new RegionInfo(regionName, regionFile, false, ConfigSource.Source, regionName);
} }
IScene scene; IScene scene;
PopulateRegionEstateInfo(regInfo); PopulateRegionEstateInfo(regInfo);
CreateRegion(regInfo, true, out scene); CreateRegion(regInfo, true, out scene);
regInfo.EstateSettings.Save(); regInfo.EstateSettings.Save();
} }