SL-13990 'My last location' sometimes is not applied

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index da21d5e69a..2d501b5783 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -458,6 +458,9 @@ void LLPanelLogin::addFavoritesToStartLocation()
 	if (combo->getValue().asString().empty())
 	{
 		combo->selectFirstItem();
+        // Value 'home' or 'last' should have been taken from NextLoginLocation
+        // but NextLoginLocation was not set, so init it from combo explicitly
+        onLocationSLURL();
 	}
 }
 
@@ -1340,6 +1343,7 @@ void LLPanelLogin::onSelectServer()
 			{
 				// the grid specified by the location is not this one, so clear the combo
 				location_combo->setCurrentByIndex(0); // last location on the new grid
+				onLocationSLURL();
 			}
 		}			
 		break;