From e0a7b7608f087b7d3a4b91ba7868e0a5c04aaa86 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 30 Nov 2009 20:19:39 -0800
Subject: Add support for dropping a region SLURL on login page and populating
 the UI

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

(limited to 'indra/newview/llpanellogin.cpp')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index d2a17dbd97..ba3782bf53 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -682,6 +682,21 @@ void LLPanelLogin::refreshLocation( bool force_visible )
 #endif
 }
 
+// static
+void LLPanelLogin::updateLocationUI()
+{
+	std::string sim_string = LLURLSimString::sInstance.mSimString;
+	if (!sim_string.empty())
+	{
+		// Replace "<Type region name>" with this region name
+		LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
+		combo->remove(2);
+		combo->add( sim_string );
+		combo->setTextEntry(sim_string);
+		combo->setCurrentByIndex( 2 );
+	}
+}
+
 // static
 void LLPanelLogin::closePanel()
 {
-- 
cgit v1.2.3


From 9204681c31184c4c76c8f41c48da76e174e3276a Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Fri, 18 Dec 2009 16:21:57 -0800
Subject: Fix slurl crashing, fix slurls highlighting objects, fix overlapping
 objects not "unhighlighting"

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

(limited to 'indra/newview/llpanellogin.cpp')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index cdfa64ba57..ce83ab3e37 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -688,6 +688,8 @@ void LLPanelLogin::refreshLocation( bool force_visible )
 // static
 void LLPanelLogin::updateLocationUI()
 {
+	if (!sInstance) return;
+	
 	std::string sim_string = LLURLSimString::sInstance.mSimString;
 	if (!sim_string.empty())
 	{
-- 
cgit v1.2.3