aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OGS/userserver/src/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OGS/userserver/src/Main.cs (renamed from ogs/userserver/src/Main.cs)10
1 files changed, 7 insertions, 3 deletions
diff --git a/ogs/userserver/src/Main.cs b/OGS/userserver/src/Main.cs
index 40ef916..7e5308e 100644
--- a/ogs/userserver/src/Main.cs
+++ b/OGS/userserver/src/Main.cs
@@ -33,6 +33,9 @@ using System.Collections.Generic;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using libsecondlife;
35using ServerConsole; 35using ServerConsole;
36using OpenSim.Framework.User;
37using OpenSim.Framework.Sims;
38using OpenSim.Framework.Inventory;
36 39
37namespace OpenGridServices 40namespace OpenGridServices
38{ 41{
@@ -73,16 +76,17 @@ namespace OpenGridServices
73 public void Startup() { 76 public void Startup() {
74 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); 77 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
75 78
76 this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: "); 79 this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
77 this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: "); 80 this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");
78 this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: "); 81 this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");
79 82
80 this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!"); 83 this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");
81 84
82 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); 85 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");
83 _profilemanager = new UserProfileManager(); 86 _profilemanager = new UserProfileManager();
84 _profilemanager.InitUserProfiles(); 87 _profilemanager.InitUserProfiles();
85 88 _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);
89
86 90
87 string tempfirstname; 91 string tempfirstname;
88 string templastname; 92 string templastname;