brought zircon branch into trunk

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;
 using System.Text;

 using libsecondlife;

 using ServerConsole;

+using OpenSim.Framework.User;

+using OpenSim.Framework.Sims;

+using OpenSim.Framework.Inventory;

 

 namespace OpenGridServices

 {

@@ -73,16 +76,17 @@ namespace OpenGridServices
                 public void Startup() {

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");

 

-                        this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");

+            this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");

                         this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");

                         this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");

                 

                         this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");

-

+           

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");

                         _profilemanager = new UserProfileManager();

                         _profilemanager.InitUserProfiles();

-        

+            _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);

+

                 

                         string tempfirstname;

                         string templastname;