1 files changed, 32 insertions, 5 deletions

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7f7aa4..6cf254b 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -3,16 +3,16 @@ using System.Collections;
 using System.Collections.Generic;

 using System.Text;

 

-using OpenGrid.Framework.Communications;

+using OpenSim.Framework.Communications;

 //using OpenSim.Framework.User;

-using OpenGrid.Framework.UserManagement;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.UserManagement;

+using OpenSim.Framework.Data;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;

 

 using libsecondlife;

 

-namespace OpenSim.LocalCommunications

+namespace OpenSim.Region.Communications.Local

 {

     public class LocalUserServices : UserManagerBase, IUserServices

     {

@@ -36,6 +36,7 @@ namespace OpenSim.LocalCommunications
         {

             return this.getUserProfile(name);

         }

+

         public UserProfileData GetUserProfile(LLUUID avatarID)

         {

             return this.getUserProfile(avatarID);

@@ -87,7 +88,7 @@ namespace OpenSim.LocalCommunications
                  "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +

                  "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

                 string capsPath = Util.GetRandomCapsPath();

-                response.SimAddress = reg.CommsIPListenAddr;

+                response.SimAddress = reg.CommsExternalAddress;

                 response.SimPort = (Int32)reg.CommsIPListenPort;

                 response.RegionX = reg.RegionLocX ;

                 response.RegionY = reg.RegionLocY ;

@@ -114,5 +115,31 @@ namespace OpenSim.LocalCommunications
 

         }

 

+        public UserProfileData SetupMasterUser(string firstName, string lastName)

+        {

+            return SetupMasterUser(firstName, lastName, "");

+        }

+

+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)

+        {

+            UserProfileData profile = getUserProfile(firstName, lastName);

+            if (profile != null)

+            {

+

+                return profile;

+            }

+

+            Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");

+            this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);

+

+            profile = getUserProfile(firstName, lastName);

+

+            if (profile == null)

+            {

+                Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");

+            }

+

+            return profile;

+        }

     }

 }