From 2a17af96e5ce9fa58e0fa29dd706fabef64f21c7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 28 Feb 2012 01:02:00 +1000
Subject: Fixes http://redmine.kokuaviewer.org/issues/1000 and remove some
 related left over cruft.

---
 linden/indra/newview/llfloatermediabrowser.cpp                      | 3 ++-
 linden/indra/newview/skins/default/xui/da/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/de/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/en-us/floater_html.xml       | 6 ------
 .../indra/newview/skins/default/xui/en-us/floater_media_browser.xml | 6 ------
 linden/indra/newview/skins/default/xui/es/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/fr/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/hu/floater_html.xml          | 3 ---
 linden/indra/newview/skins/default/xui/it/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/ja/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/nl/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/pl/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/pt/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/ru/floater_html.xml          | 3 ---
 linden/indra/newview/skins/default/xui/uk/floater_html.xml          | 3 ---
 15 files changed, 2 insertions(+), 76 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index 54ffc0f..ed1ec42 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -54,6 +54,7 @@
 #include "llviewerparcelmedia.h"
 #include "llcombobox.h"
 
+#include "hippogridmanager.h"
 
 // TEMP
 #include "llsdutil.h"
@@ -157,7 +158,7 @@ void LLFloaterMediaBrowser::buildURLHistory()
 
 std::string LLFloaterMediaBrowser::getSupportURL()
 {
-	return getString("support_page_url");
+	return gHippoGridManager->getConnectedGrid()->getSupportURL();
 }
 void LLFloaterMediaBrowser::onClose(bool app_quitting)
 {
diff --git a/linden/indra/newview/skins/default/xui/da/floater_html.xml b/linden/indra/newview/skins/default/xui/da/floater_html.xml
index 28480f8..5961a0d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Retur" name="back_btn" />
 	<button label="Frem" name="forward_btn" />
 	<button label="start" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7bf1bad..55a9580 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Zurück" name="back_btn" />
 	<button label="Weiter" name="forward_btn" />
 	<button label="Los" name="go_btn" />
-	<string name="home_page_url">
-		http://de.secondlife.com
-	</string>
-	<string name="support_page_url">
-	  	http://de.secondlife.com/support
-	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index d107454..76283c3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -16,10 +16,4 @@
 	     select_all_on_focus_received="true" width="435" />
 	<button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
 	     label="Go" left_delta="440" name="go_btn" width="70" />
-	<string name="home_page_url">
-	  	http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-	  	http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 76eee6f..12fe153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -48,10 +48,4 @@
 			     left="-110" name="set_home" width="104" />
 		</layout_panel>
 	</layout_stack>
-  <string name="home_page_url">
-    http://www.secondlife.com
-  </string>
-  <string name="support_page_url">
-    http://support.secondlife.com
-  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index 5977fff..8f469b1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Atrás" name="back_btn"/>
 	<button label="Adelante" name="forward_btn"/>
 	<button label="Ir" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index 1538189..f335617 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -7,10 +7,4 @@
 	<button label="Arrêter" name="stop_btn" />
 	<button label="Domicile" name="home_btn" />
 	<button label="Aller" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_html.xml b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
index 21b6a21..5923c52 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
@@ -5,9 +5,6 @@
 	<button label="Kezdő helyszín" name="home_btn" />
 	<button label="Előre" name="forward_btn" />
 	<button label="Menj" name="go_btn" />
-	<text name="home_page_url">
-		http://www.google.com
-	</text>
 	<text name="in-world_help_title">
 		In-World segítség
 	</text>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_html.xml b/linden/indra/newview/skins/default/xui/it/floater_html.xml
index 4080f80..b2d1951 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Indietro" name="back_btn"/>
 	<button label="Avanti" name="forward_btn"/>
 	<button label="Vai" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 62aac82..1cb5384 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -5,10 +5,4 @@
 	<button label="ホーム" name="home_btn" />
 	<button label="進む" name="forward_btn" />
 	<button label="移動" name="go_btn" />
-	<string name="home_page_url">
-		http://jp.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://wiki.secondlife.com/wiki/Knowledge_Base/ja
-	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/nl/floater_html.xml b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
index 1604248..0147319 100644
--- a/linden/indra/newview/skins/default/xui/nl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Terug" name="back_btn"/>
 	<button label="Vooruit" name="forward_btn"/>
 	<button label="Ga" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_html.xml b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
index 90d29e1..645fe80 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
@@ -5,10 +5,4 @@
 	<button label="Prześlij dalej" name="forward_btn" width="85"/>
 	<line_editor left_delta="100" name="url_edit" width="420" />
 	<button label="Idź" name="go_btn" left_delta="425" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index 3d500dd..aaa49c8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Voltar" name="back_btn"/>
 	<button label="Adiantar" name="forward_btn"/>
 	<button label="Ir" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_html.xml b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
index 4a5942b..6492440 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
@@ -4,7 +4,4 @@
 	<button label="Назад" name="back_btn" />
 	<button label="Вперед" name="forward_btn" />
 	<button label="Перейти" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_html.xml b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
index 8bde260..11a10cf 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
@@ -4,7 +4,4 @@
 	<button label="Назад" name="back_btn" />
 	<button label="Вперед" name="forward_btn" />
 	<button label="Перейти" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
 </floater>
-- 
cgit v1.1