aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-04-21 05:09:06 +0000
committerAdam Frisby2007-04-21 05:09:06 +0000
commit9990bf4826c737c63c16c810ad025333f2b506ac (patch)
tree1bb3180ab19f4b0de9567822fe667190b63f8015
parentAdded an island to the coast of this terrain. (diff)
downloadopensim-SC_OLD-9990bf4826c737c63c16c810ad025333f2b506ac.zip
opensim-SC_OLD-9990bf4826c737c63c16c810ad025333f2b506ac.tar.gz
opensim-SC_OLD-9990bf4826c737c63c16c810ad025333f2b506ac.tar.bz2
opensim-SC_OLD-9990bf4826c737c63c16c810ad025333f2b506ac.tar.xz
Config:
* Added sane defaults to each configuration step. (The defaults for sim/user/grid will now create a working grid)
-rw-r--r--OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs16
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs6
-rw-r--r--OpenUser.Config/UserConfigDb4o/DbUserConfig.cs6
3 files changed, 14 insertions, 14 deletions
diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index 14d072e..b1fb8bb 100644
--- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -50,16 +50,16 @@ namespace OpenGrid.Config.GridConfigDb4o
50 50
51 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team"); 51 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
52 52
53 this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server"); 53 this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
54 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server"); 54 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server","null");
55 this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server"); 55 this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server","null");
56 56
57 this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server"); 57 this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
58 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server"); 58 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server","null");
59 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server"); 59 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server","null");
60 60
61 this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims"); 61 this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims","null");
62 this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims"); 62 this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims","null");
63 } 63 }
64 64
65 public override void InitConfig() { 65 public override void InitConfig() {
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index d3f67ef..d17e1fd 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -177,7 +177,7 @@ namespace OpenSim
177 attri = configData.GetAttribute("GridServerURL"); 177 attri = configData.GetAttribute("GridServerURL");
178 if (attri == "") 178 if (attri == "")
179 { 179 {
180 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL"); 180 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
181 configData.SetAttribute("GridServerURL", this.GridURL); 181 configData.SetAttribute("GridServerURL", this.GridURL);
182 } 182 }
183 else 183 else
@@ -190,7 +190,7 @@ namespace OpenSim
190 attri = configData.GetAttribute("GridSendKey"); 190 attri = configData.GetAttribute("GridSendKey");
191 if (attri == "") 191 if (attri == "")
192 { 192 {
193 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server"); 193 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
194 configData.SetAttribute("GridSendKey", this.GridSendKey); 194 configData.SetAttribute("GridSendKey", this.GridSendKey);
195 } 195 }
196 else 196 else
@@ -203,7 +203,7 @@ namespace OpenSim
203 attri = configData.GetAttribute("GridRecvKey"); 203 attri = configData.GetAttribute("GridRecvKey");
204 if (attri == "") 204 if (attri == "")
205 { 205 {
206 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server"); 206 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
207 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 207 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
208 } 208 }
209 else 209 else
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index fd349db..3fff35d 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -50,9 +50,9 @@ namespace OpenUser.Config.UserConfigDb4o
50 50
51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
52 52
53 this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL"); 53 this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
54 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server"); 54 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
55 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server"); 55 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
56 } 56 }
57 57
58 public override void InitConfig() { 58 public override void InitConfig() {