1 files changed, 85 insertions, 11 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
index fdfdd16..7a7f2bf 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -4,9 +4,11 @@ using System.Collections.Generic;
 using System.Text;
 using OpenGrid.Framework.Communications;
-using OpenSim.Framework.User;
+//using OpenSim.Framework.User;
 using OpenGrid.Framework.UserManagement;
 using OpenGrid.Framework.Data;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
 using libsecondlife;
@@ -14,30 +16,102 @@ namespace OpenSim.LocalCommunications
 {
    public class LocalUserServices : UserManagerBase, IUserServices
    {
-       
+        private CommunicationsLocal m_Parent;
-        public LocalUserServices()
-        {
+        private uint defaultHomeX ;
+        private uint defaultHomeY;
+        public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
+        {
+            m_Parent = parent;
+            defaultHomeX = defHomeX;
+            defaultHomeY = defHomeY;
        }
-        public UserProfileData GetUserProfile(string first_name, string last_name)
+        public UserProfileData GetUserProfile(string firstName, string lastName)
        {
-            return GetUserProfile(first_name + " " + last_name);
+            return GetUserProfile(firstName + " " + lastName);
        }
        public UserProfileData GetUserProfile(string name)
        {
-            return null;
+            return this.getUserProfile(name);
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return this.getUserProfile(avatarID);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string GetMessage()
+        {
+            return "Welcome to OpenSim";
+        }
+        public override UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            UserProfileData profile = getUserProfile(firstname, lastname);
+            if (profile != null)
+            {
+               
+                return profile;
+            }
+            //no current user account so make one
+            Console.WriteLine("No User account found so creating a new one ");
+            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
+            
+            profile = getUserProfile(firstname, lastname);
+            return profile;
        }
-        public UserProfileData GetUserProfile(LLUUID avatar_id)
+        public override bool AuthenticateUser(ref UserProfileData profile, string password)
        {
-            return null;
+            //for now we will accept any password in sandbox mode
+            Console.WriteLine("authorising user");
+            return true;
        }
-        public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
+        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
        {
+            ulong currentRegion = theUser.currentAgent.currentHandle;
+            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
+            if (reg != null)
+            {
+                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
+                 "'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() + "]}";
+                response.SimAddress = reg.IPListenAddr;
+                response.SimPort = (Int32)reg.IPListenPort;
+                response.RegionX = reg.RegionLocX ;
+                response.RegionY = reg.RegionLocY ;
+                theUser.currentAgent.currentRegion = reg.SimUUID;
+                theUser.currentAgent.currentHandle = reg.RegionHandle;
+                Login _login = new Login();
+                //copy data to login object
+                _login.First = response.Firstname;
+                _login.Last = response.Lastname;
+                _login.Agent = response.AgentID;
+                _login.Session = response.SessionID;
+                _login.SecureSession = response.SecureSessionID;
+                _login.CircuitCode = (uint)response.CircuitCode;
+                m_Parent.InformRegionOfLogin(currentRegion, _login);
+            }
+            else
+            {
+                Console.WriteLine("not found region " + currentRegion);
+            }
        }
-       
    }
 }

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs index fdfdd16..7a7f2bf 100644 --- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs +++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -4,9 +4,11 @@ using System.Collections.Generic;
4	using System.Text;	4	using System.Text;
5		5
6	using OpenGrid.Framework.Communications;	6	using OpenGrid.Framework.Communications;
7	using OpenSim.Framework.User;	7	//using OpenSim.Framework.User;
8	using OpenGrid.Framework.UserManagement;	8	using OpenGrid.Framework.UserManagement;
9	using OpenGrid.Framework.Data;	9	using OpenGrid.Framework.Data;
		10	using OpenSim.Framework.Types;
		11	using OpenSim.Framework.Utilities;
10		12
11	using libsecondlife;	13	using libsecondlife;
12		14
@@ -14,30 +16,102 @@ namespace OpenSim.LocalCommunications
14	{	16	{
15	public class LocalUserServices : UserManagerBase, IUserServices	17	public class LocalUserServices : UserManagerBase, IUserServices
16	{	18	{
17		19	private CommunicationsLocal m_Parent;
18	public LocalUserServices()
19	{
20		20
		21	private uint defaultHomeX ;
		22	private uint defaultHomeY;
		23	public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
		24	{
		25	m_Parent = parent;
		26	defaultHomeX = defHomeX;
		27	defaultHomeY = defHomeY;
21	}	28	}
22		29
23	public UserProfileData GetUserProfile(string first_name, string last_name)	30	public UserProfileData GetUserProfile(string firstName, string lastName)
24	{	31	{
25	return GetUserProfile(first_name + " " + last_name);	32	return GetUserProfile(firstName + " " + lastName);
26	}	33	}
27		34
28	public UserProfileData GetUserProfile(string name)	35	public UserProfileData GetUserProfile(string name)
29	{	36	{
30	return null;	37	return this.getUserProfile(name);
		38	}
		39	public UserProfileData GetUserProfile(LLUUID avatarID)
		40	{
		41	return this.getUserProfile(avatarID);
		42	}
		43
		44	/// <summary>
		45	///
		46	/// </summary>
		47	/// <returns></returns>
		48	public override string GetMessage()
		49	{
		50	return "Welcome to OpenSim";
		51	}
		52
		53	public override UserProfileData GetTheUser(string firstname, string lastname)
		54	{
		55	UserProfileData profile = getUserProfile(firstname, lastname);
		56	if (profile != null)
		57	{
		58
		59	return profile;
		60	}
		61
		62	//no current user account so make one
		63	Console.WriteLine("No User account found so creating a new one ");
		64	this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
		65
		66	profile = getUserProfile(firstname, lastname);
		67
		68	return profile;
31	}	69	}
32	public UserProfileData GetUserProfile(LLUUID avatar_id)	70
		71	public override bool AuthenticateUser(ref UserProfileData profile, string password)
33	{	72	{
34	return null;	73	//for now we will accept any password in sandbox mode
		74	Console.WriteLine("authorising user");
		75	return true;
35	}	76	}
36		77
37	public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)	78	public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
38	{	79	{
		80	ulong currentRegion = theUser.currentAgent.currentHandle;
		81	RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
		82
		83
		84	if (reg != null)
		85	{
		86	response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
		87	"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
		88	"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
		89
		90	response.SimAddress = reg.IPListenAddr;
		91	response.SimPort = (Int32)reg.IPListenPort;
		92	response.RegionX = reg.RegionLocX ;
		93	response.RegionY = reg.RegionLocY ;
		94
		95	theUser.currentAgent.currentRegion = reg.SimUUID;
		96	theUser.currentAgent.currentHandle = reg.RegionHandle;
		97
		98	Login _login = new Login();
		99	//copy data to login object
		100	_login.First = response.Firstname;
		101	_login.Last = response.Lastname;
		102	_login.Agent = response.AgentID;
		103	_login.Session = response.SessionID;
		104	_login.SecureSession = response.SecureSessionID;
		105	_login.CircuitCode = (uint)response.CircuitCode;
		106
		107	m_Parent.InformRegionOfLogin(currentRegion, _login);
		108	}
		109	else
		110	{
		111	Console.WriteLine("not found region " + currentRegion);
		112	}
39		113
40	}	114	}
41		115
42	}	116	}
43	}	117	}