Config:
* Added sane defaults to each configuration step. (The defaults for sim/user/grid will now create a working grid)0.1-prestable
parent
7bf38d37c3
commit
9990bf4826
|
@ -50,16 +50,16 @@ namespace OpenGrid.Config.GridConfigDb4o
|
||||||
|
|
||||||
this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
|
this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
|
||||||
|
|
||||||
this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server");
|
this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
|
||||||
this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server");
|
this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server","null");
|
||||||
this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server");
|
this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server","null");
|
||||||
|
|
||||||
this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server");
|
this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
|
||||||
this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server");
|
this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server","null");
|
||||||
this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server");
|
this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server","null");
|
||||||
|
|
||||||
this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims");
|
this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims","null");
|
||||||
this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims");
|
this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims","null");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void InitConfig() {
|
public override void InitConfig() {
|
||||||
|
|
|
@ -177,7 +177,7 @@ namespace OpenSim
|
||||||
attri = configData.GetAttribute("GridServerURL");
|
attri = configData.GetAttribute("GridServerURL");
|
||||||
if (attri == "")
|
if (attri == "")
|
||||||
{
|
{
|
||||||
this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL");
|
this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
|
||||||
configData.SetAttribute("GridServerURL", this.GridURL);
|
configData.SetAttribute("GridServerURL", this.GridURL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -190,7 +190,7 @@ namespace OpenSim
|
||||||
attri = configData.GetAttribute("GridSendKey");
|
attri = configData.GetAttribute("GridSendKey");
|
||||||
if (attri == "")
|
if (attri == "")
|
||||||
{
|
{
|
||||||
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server");
|
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
|
||||||
configData.SetAttribute("GridSendKey", this.GridSendKey);
|
configData.SetAttribute("GridSendKey", this.GridSendKey);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -203,7 +203,7 @@ namespace OpenSim
|
||||||
attri = configData.GetAttribute("GridRecvKey");
|
attri = configData.GetAttribute("GridRecvKey");
|
||||||
if (attri == "")
|
if (attri == "")
|
||||||
{
|
{
|
||||||
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server");
|
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
|
||||||
configData.SetAttribute("GridRecvKey", this.GridRecvKey);
|
configData.SetAttribute("GridRecvKey", this.GridRecvKey);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -50,9 +50,9 @@ namespace OpenUser.Config.UserConfigDb4o
|
||||||
|
|
||||||
this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
|
this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
|
||||||
|
|
||||||
this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL");
|
this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
|
||||||
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server");
|
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
|
||||||
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server");
|
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void InitConfig() {
|
public override void InitConfig() {
|
||||||
|
|
Loading…
Reference in New Issue