1 files changed, 16 insertions, 2 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index d7b3a58..6088890 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -123,9 +123,23 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest)
         {
-            ulong currentRegion = theUser.currentAgent.currentHandle;
+            ulong currentRegion = 0;
+            if (startLocationRequest == "last")
+            {
+                currentRegion = theUser.currentAgent.currentHandle;
+            }
+            else if (startLocationRequest == "home")
+            {
+                currentRegion = theUser.homeRegion;
+            }
+            else
+            {
+                // TODO: Parse string in the following format: 'uri:RegionName&X&Y&Z'
+                currentRegion = theUser.currentAgent.currentHandle;
+            }
+
             RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion);
 
             if (reg != null)