From af3d4fdf4ef8b3b5aa04124daac24a226b8bf02b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 28 Oct 2020 19:05:15 +0200
Subject: [PATCH] SL-14167 FIXED Viewer substitutes agni start locations when
 logging in to 'My last location' on non-agni grids

---
 indra/newview/llpanellogin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index da21d5e69a6..98fe286d162 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1325,8 +1325,10 @@ void LLPanelLogin::onSelectServer()
 	switch (index)
 	{
 	case 0: // last location
+        LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_LAST));
+        break;
 	case 1: // home location
-		// do nothing - these are grid-agnostic locations
+        LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME));
 		break;
 		
 	default:
-- 
GitLab