aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer.Config
diff options
context:
space:
mode:
authorlbsa712007-10-15 08:42:15 +0000
committerlbsa712007-10-15 08:42:15 +0000
commit9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae (patch)
treefbc6bf234f5f2c4d2ef8d5eb55b6b02a2c947238 /OpenSim/Grid/GridServer.Config
parent* Added #474 Chillken Windows Installer generating script - haven't tried it,... (diff)
downloadopensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.zip
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.gz
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.bz2
opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.xz
* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!
Diffstat (limited to 'OpenSim/Grid/GridServer.Config')
-rw-r--r--OpenSim/Grid/GridServer.Config/DbGridConfig.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index d26e6c1..d81e5cc 100644
--- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -27,6 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using Db4objects.Db4o; 29using Db4objects.Db4o;
30using OpenSim.Framework.Configuration;
30using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
32 33
@@ -68,12 +69,12 @@ namespace OpenGrid.Config.GridConfigDb4o
68 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); 69 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
69 70
70 // Asset Options 71 // Asset Options
71 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); 72 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
72 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null"); 73 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
73 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); 74 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
74 75
75 // User Server Options 76 // User Server Options
76 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); 77 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
77 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null"); 78 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
78 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null"); 79 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
79 80