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

* worked some more on the RegionInfo attr fuggliness

Sugilite
lbsa71 2007-07-02 06:55:36 +00:00
parent 7f18f494f1
commit d78f6505e3
1 changed files with 15 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
OpenSim/Framework/General/Types/RegionInfo.cs
View File

@ -108,45 +108,6 @@ namespace OpenSim.Framework.Types
public string MasterAvatarLastName = ""; public string MasterAvatarLastName = "";
public string MasterAvatarSandboxPassword = ""; public string MasterAvatarSandboxPassword = "";
//private int? m_commsIPListenPort;
///// <summary>
///// Port used for listening (TCP and UDP)
///// </summary>
///// <remarks>Seperate TCP and UDP</remarks>
//public int CommsIPListenPort
//{
// get
// {
// return m_commsIPListenPort.Value;
// }
//}
//private string m_commsIPListenAddr;
///// <summary>
///// Address used for internal listening (default: 0.0.0.0?)
///// </summary>
//public string CommsIPListenAddr
//{
// get
// {
// return m_commsIPListenAddr;
// }
//}
//private string m_commsExternalAddress;
///// <summary>
///// Address used for external addressing (DNS or IP)
///// </summary>
//public string CommsExternalAddress
//{
// get
// {
// return m_commsExternalAddress;
// }
//}
public EstateSettings estateSettings; public EstateSettings estateSettings;
public RegionInfo() public RegionInfo()
@ -160,10 +121,6 @@ namespace OpenSim.Framework.Types
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
//m_commsIPListenAddr = simIp;
//m_commsIPListenPort = simPort;
//m_commsExternalAddress = simUri;
m_internalEndPoint = internalEndPoint; m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri; m_externalHostName = externalUri;
} }
@ -173,32 +130,24 @@ namespace OpenSim.Framework.Types
this.isSandbox = sandboxMode; this.isSandbox = sandboxMode;
try try
{ {
// Sim UUID
string attri = ""; string attri = "";
attri = configData.GetAttribute("SimUUID");
if (attri == "") // Sim UUID
string simId = configData.GetAttribute("SimUUID");
if (String.IsNullOrEmpty( simId ))
{ {
this.SimUUID = LLUUID.Random(); this.SimUUID = LLUUID.Random();
}
else
{
this.SimUUID = new LLUUID(simId);
}
configData.SetAttribute("SimUUID", this.SimUUID.ToString()); configData.SetAttribute("SimUUID", this.SimUUID.ToString());
}
else
{
this.SimUUID = new LLUUID(attri);
}
// Sim name this.RegionName = GetString(configData, "SimName", "OpenSim test", "Region Name");
attri = "";
attri = configData.GetAttribute("SimName"); //m_regionLocX = (uint) GetInt(configData, "SimLocationX", 1000, "Grid Location X");
if (attri == "")
{
this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");
configData.SetAttribute("SimName", this.RegionName);
}
else
{
this.RegionName = attri;
}
// Sim/Grid location X
attri = ""; attri = "";
attri = configData.GetAttribute("SimLocationX"); attri = configData.GetAttribute("SimLocationX");
if (attri == "") if (attri == "")
@ -312,6 +261,11 @@ namespace OpenSim.Framework.Types
} }
private uint GetInt(IGenericConfig configData, string p, int p_3, string p_4)
{
throw new Exception("The method or operation is not implemented.");
}
private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt) private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
{ {
string s = configData.GetAttribute(attrName); string s = configData.GetAttribute(attrName);