1 files changed, 96 insertions, 100 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b6564bf..75c4dc1 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -388,84 +388,115 @@ namespace OpenSim.Framework.Communications
             // Profile UUID
             agent.ProfileID = profile.ID;
 
-            // Current position (from Home)
-            agent.Handle = profile.HomeRegion;
-            agent.Position = profile.HomeLocation;
-
-            // If user specified additional start, use that
-            if (requestData.ContainsKey("start"))
+            // Current location/position/alignment
+            if (profile.CurrentAgent != null)
             {
-                string startLoc = ((string)requestData["start"]).Trim();
-                if (("last" == startLoc) && (profile.CurrentAgent != null))
-                {
-                    if ((profile.CurrentAgent.Position.X > 0)
-                        && (profile.CurrentAgent.Position.Y > 0)
-                        && (profile.CurrentAgent.Position.Z > 0)
-                        )
-                    {
-                        // TODO: Right now, currentRegion has not been used in GridServer for requesting region.
-                        // TODO: It is only using currentHandle.
-                        agent.Region = profile.CurrentAgent.Region;
-                        agent.Handle = profile.CurrentAgent.Handle;
-                        agent.Position = profile.CurrentAgent.Position;
-                    }
-                }
-
-//                if (!(startLoc == "last" || startLoc == "home"))
-//                {
-//                    // Format: uri:Ahern&162&213&34
-//                    try
-//                    {
-//                        string[] parts = startLoc.Remove(0, 4).Split('&');
-//                        //string region = parts[0];
-//
-//                        ////////////////////////////////////////////////////
-//                        //SimProfile SimInfo = new SimProfile();
-//                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
-//                    }
-//                    catch (Exception)
-//                    {
-//                    }
-//                }
+                agent.Region = profile.CurrentAgent.Region;
+                agent.Handle = profile.CurrentAgent.Handle;
+                agent.Position = profile.CurrentAgent.Position;
+                agent.LookAt = profile.CurrentAgent.LookAt;
+            }
+            else
+            {
+                agent.Region = profile.HomeRegionID;
+                agent.Handle = profile.HomeRegion;
+                agent.Position = profile.HomeLocation;
+                agent.LookAt = profile.HomeLookAt;
             }
 
             // What time did the user login?
             agent.LoginTime = Util.UnixTimeSinceEpoch();
             agent.LogoutTime = 0;
 
-            // Current location
-            agent.InitialRegion = UUID.Zero; // Fill in later
-            agent.Region = UUID.Zero; // Fill in later
+            profile.CurrentAgent = agent;
+        }
+
+        public void CreateAgent(UserProfileData profile, LLSD request)
+        {
+            UserAgentData agent = new UserAgentData();
+
+            // User connection
+            agent.AgentOnline = true;
+
+            //if (request.Params.Count > 1)
+            //{
+            //    IPEndPoint RemoteIPEndPoint = (IPEndPoint)request.Params[1];
+            //    agent.AgentIP = RemoteIPEndPoint.Address.ToString();
+            //    agent.AgentPort = (uint)RemoteIPEndPoint.Port;
+            //}
+
+            // Generate sessions
+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+            byte[] randDataS = new byte[16];
+            byte[] randDataSS = new byte[16];
+            rand.GetBytes(randDataS);
+            rand.GetBytes(randDataSS);
+
+            agent.SecureSessionID = new UUID(randDataSS, 0);
+            agent.SessionID = new UUID(randDataS, 0);
+
+            // Profile UUID
+            agent.ProfileID = profile.ID;
+
+            // Current location/position/alignment
+            if (profile.CurrentAgent != null)
+            {
+                agent.Region = profile.CurrentAgent.Region;
+                agent.Handle = profile.CurrentAgent.Handle;
+                agent.Position = profile.CurrentAgent.Position;
+                agent.LookAt = profile.CurrentAgent.LookAt;
+            }
+            else
+            {
+                agent.Region = profile.HomeRegionID;
+                agent.Handle = profile.HomeRegion;
+                agent.Position = profile.HomeLocation;
+                agent.LookAt = profile.HomeLookAt;
+            }
+
+            // What time did the user login?
+            agent.LoginTime = Util.UnixTimeSinceEpoch();
+            agent.LogoutTime = 0;
 
             profile.CurrentAgent = agent;
         }
 
         /// <summary>
+        /// Saves a target agent to the database
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <returns>Successful?</returns>
+        public bool CommitAgent(ref UserProfileData profile)
+        {
+            // TODO: how is this function different from setUserProfile?  -> Add AddUserAgent() here and commit both tables "users" and "agents"
+            // TODO: what is the logic should be?
+            bool ret = false;
+            ret = AddUserAgent(profile.CurrentAgent);
+            ret = ret & UpdateUserProfile(profile);
+            return ret;
+        }
+
+        /// <summary>
         /// Process a user logoff from OpenSim.
         /// </summary>
         /// <param name="userid"></param>
         /// <param name="regionid"></param>
         /// <param name="regionhandle"></param>
-        /// <param name="posx"></param>
-        /// <param name="posy"></param>
-        /// <param name="posz"></param>
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
+        /// <param name="position"></param>
+        /// <param name="lookat"></param>
+        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
         {
             if (StatsManager.UserStats != null)
                 StatsManager.UserStats.AddLogout();
 
-            UserProfileData userProfile;
-            UserAgentData userAgent;
-            Vector3 currentPos = new Vector3(posx, posy, posz);
-
-            userProfile = GetUserProfile(userid);
+            UserProfileData userProfile = GetUserProfile(userid);
 
             if (userProfile != null)
             {
                 // This line needs to be in side the above if statement or the UserServer will crash on some logouts.
-                m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + posx + "," + posy + "," + posz + ")");
+                m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + position.X + "," + position.Y + "," + position.Z + ")");
 
-                userAgent = userProfile.CurrentAgent;
+                UserAgentData userAgent = userProfile.CurrentAgent;
                 if (userAgent != null)
                 {
                     userAgent.AgentOnline = false;
@@ -475,10 +506,11 @@ namespace OpenSim.Framework.Communications
                     {
                         userAgent.Region = regionid;
                     }
-
                     userAgent.Handle = regionhandle;
-                    userAgent.Position = currentPos;
-                    userProfile.CurrentAgent = userAgent;
+                    userAgent.Position = position;
+                    userAgent.LookAt = lookat;
+                    //userProfile.CurrentAgent = userAgent;
+                    userProfile.LastLogin = userAgent.LogoutTime;
 
                     CommitAgent(ref userProfile);
                 }
@@ -494,54 +526,18 @@ namespace OpenSim.Framework.Communications
             }
         }
 
-        public void CreateAgent(UserProfileData profile, LLSD request)
-        {
-            UserAgentData agent = new UserAgentData();
-
-            // User connection
-            agent.AgentOnline = true;
-
-            // Generate sessions
-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
-            byte[] randDataS = new byte[16];
-            byte[] randDataSS = new byte[16];
-            rand.GetBytes(randDataS);
-            rand.GetBytes(randDataSS);
-
-            agent.SecureSessionID = new UUID(randDataSS, 0);
-            agent.SessionID = new UUID(randDataS, 0);
-
-            // Profile UUID
-            agent.ProfileID = profile.ID;
-
-            // Current position (from Home)
-            agent.Handle = profile.HomeRegion;
-            agent.Position = profile.HomeLocation;
-
-            // What time did the user login?
-            agent.LoginTime = Util.UnixTimeSinceEpoch();
-            agent.LogoutTime = 0;
-
-            // Current location
-            agent.InitialRegion = UUID.Zero; // Fill in later
-            agent.Region = UUID.Zero; // Fill in later
-
-            profile.CurrentAgent = agent;
-        }
-
         /// <summary>
-        /// Saves a target agent to the database
+        /// Process a user logoff from OpenSim (deprecated as of 2008-08-27)
         /// </summary>
-        /// <param name="profile">The users profile</param>
-        /// <returns>Successful?</returns>
-        public bool CommitAgent(ref UserProfileData profile)
+        /// <param name="userid"></param>
+        /// <param name="regionid"></param>
+        /// <param name="regionhandle"></param>
+        /// <param name="posx"></param>
+        /// <param name="posy"></param>
+        /// <param name="posz"></param>
+        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
         {
-            // TODO: how is this function different from setUserProfile?  -> Add AddUserAgent() here and commit both tables "users" and "agents"
-            // TODO: what is the logic should be?
-            bool ret = false;
-            ret = AddUserAgent(profile.CurrentAgent);
-            ret = ret & UpdateUserProfile(profile);
-            return ret;
+            LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3());
         }
 
         #endregion