From this version onwards, all new region files created automatically will

be created as new style INI files.
This doesn't yet affect create region, but it does affect first starts of
OpenSim.exe
Because master avatars are slated to be replaced by estate owners, this now
allows regions to be created without any master avatar data.
0.6.6-post-fixes
Melanie Thielker 2009-06-25 17:53:03 +00:00
parent 9e714b9784
commit 82305b0dea
2 changed files with 117 additions and 13 deletions

View File

@ -29,9 +29,11 @@ using System;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Xml; using System.Xml;
using System.IO;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using OpenSim.Framework.Console;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
@ -250,6 +252,16 @@ namespace OpenSim.Framework
if (filename.ToLower().EndsWith(".ini")) if (filename.ToLower().EndsWith(".ini"))
{ {
if (!File.Exists(filename)) // New region config request
{
IniConfigSource newFile = new IniConfigSource();
ReadNiniConfig(newFile, String.Empty);
newFile.Save(filename);
return;
}
IConfigSource source = new IniConfigSource(filename); IConfigSource source = new IniConfigSource(filename);
ReadNiniConfig(source, configName); ReadNiniConfig(source, configName);
@ -390,11 +402,28 @@ namespace OpenSim.Framework
private void ReadNiniConfig(IConfigSource source, string name) private void ReadNiniConfig(IConfigSource source, string name)
{ {
bool creatingNew = false;
if (source.Configs.Count == 0)
{
name = MainConsole.Instance.CmdPrompt("New region name", String.Empty);
if (name == String.Empty)
throw new Exception("Cannot interactively create region with no name");
IConfig newRegion = source.AddConfig(name);
creatingNew = true;
}
if (name == String.Empty) if (name == String.Empty)
name = source.Configs[0].Name; name = source.Configs[0].Name;
if (source.Configs[name] == null) if (source.Configs[name] == null)
throw new Exception("Config name does not exist"); {
IConfig newRegion = source.AddConfig(name);
creatingNew = true;
}
IConfig config = source.Configs[name]; IConfig config = source.Configs[name];
@ -403,7 +432,12 @@ namespace OpenSim.Framework
string regionUUID = config.GetString("RegionUUID", string.Empty); string regionUUID = config.GetString("RegionUUID", string.Empty);
if (regionUUID == String.Empty) if (regionUUID == String.Empty)
throw new Exception("A region UUID is required"); {
UUID newID = UUID.Random();
regionUUID = MainConsole.Instance.CmdPrompt("Region UUID", newID.ToString());
config.Set("RegionUUID", regionUUID);
}
RegionID = new UUID(regionUUID); RegionID = new UUID(regionUUID);
originRegionID = RegionID; // What IS this?! originRegionID = RegionID; // What IS this?!
@ -419,7 +453,10 @@ namespace OpenSim.Framework
string location = config.GetString("Location", String.Empty); string location = config.GetString("Location", String.Empty);
if (location == String.Empty) if (location == String.Empty)
throw new Exception("Location is required"); {
location = MainConsole.Instance.CmdPrompt("Region Location", "1000,1000");
config.Set("Location", location);
}
string[] locationElements = location.Split(new char[] {','}); string[] locationElements = location.Split(new char[] {','});
@ -434,16 +471,57 @@ namespace OpenSim.Framework
// Internal IP // Internal IP
// //
IPAddress address = IPAddress.Parse(config.GetString("InternalAddress", "127.0.0.1")); IPAddress address;
int port = config.GetInt("InternalPort", 9000);
if (config.Contains("InternalAddress"))
{
address = IPAddress.Parse(config.GetString("InternalAddress", String.Empty));
}
else
{
address = IPAddress.Parse(MainConsole.Instance.CmdPrompt("Internal IP address", "127.0.0.1"));
config.Set("InternalAddress", address.ToString());
}
int port;
if (config.Contains("InternalPort"))
{
port = config.GetInt("InternalPort", 9000);
}
else
{
port = Convert.ToInt32(MainConsole.Instance.CmdPrompt("Internal port", "9000"));
config.Set("InternalPort", port);
}
m_internalEndPoint = new IPEndPoint(address, port); m_internalEndPoint = new IPEndPoint(address, port);
if (config.Contains("AllowAlternatePorts"))
{
m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true); m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true);
}
else
{
m_allow_alternate_ports = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Allow alternate ports", "False"));
config.Set("AllowAlternatePorts", m_allow_alternate_ports.ToString());
}
// External IP // External IP
// //
string externalName = config.GetString("ExternalHostName", "SYSTEMIP"); string externalName;
if (config.Contains("ExternalHostName"))
{
externalName = config.GetString("ExternalHostName", "SYSTEMIP");
}
else
{
externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
config.Set("ExternalHostName", externalName);
}
if (externalName == "SYSTEMIP") if (externalName == "SYSTEMIP")
m_externalHostName = Util.GetLocalHost().ToString(); m_externalHostName = Util.GetLocalHost().ToString();
else else
@ -452,12 +530,38 @@ namespace OpenSim.Framework
// Master avatar cruft // Master avatar cruft
// //
string masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString()); string masterAvatarUUID;
MasterAvatarAssignedUUID = new UUID(masterAvatarUUID); if (!creatingNew)
{
masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString());
MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty); MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty);
MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty); MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty);
MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty); MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty);
}
else
{
masterAvatarUUID = MainConsole.Instance.CmdPrompt("Master Avatar UUID", UUID.Zero.ToString());
if (masterAvatarUUID != UUID.Zero.ToString())
{
config.Set("MasterAvatarUUID", masterAvatarUUID);
}
else
{
MasterAvatarFirstName = MainConsole.Instance.CmdPrompt("Master Avatar first name (enter for no master avatar)", String.Empty);
if (MasterAvatarFirstName != String.Empty)
{
MasterAvatarLastName = MainConsole.Instance.CmdPrompt("Master Avatar last name", String.Empty);
MasterAvatarSandboxPassword = MainConsole.Instance.CmdPrompt("Master Avatar sandbox password", String.Empty);
config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
config.Set("MasterAvatarLastName", MasterAvatarLastName);
config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
}
}
}
MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
// Prim stuff // Prim stuff

View File

@ -65,8 +65,8 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
if (configFiles.Length == 0 && iniFiles.Length == 0) if (configFiles.Length == 0 && iniFiles.Length == 0)
{ {
new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false, m_configSource); new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
} }
List<RegionInfo> regionInfos = new List<RegionInfo>(); List<RegionInfo> regionInfos = new List<RegionInfo>();