From 5ba642526c3343eddf120b3cfbf3bdb23c1fdf95 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 21 Jan 2009 18:45:08 -0700
Subject: Fixed browser layout, toggling; removed legacy browser code

---
 .../newview/skins/default/xui/de/floater_html.xml  | 14 ------------
 .../skins/default/xui/en-us/floater_html.xml       | 25 ----------------------
 .../default/xui/en-us/floater_media_browser.xml    | 16 +++++++-------
 .../newview/skins/default/xui/en-us/strings.xml    |  1 +
 .../newview/skins/default/xui/es/floater_html.xml  | 12 -----------
 .../newview/skins/default/xui/fr/floater_html.xml  | 16 --------------
 .../newview/skins/default/xui/ja/floater_html.xml  | 14 ------------
 .../newview/skins/default/xui/ko/floater_html.xml  | 14 ------------
 .../newview/skins/default/xui/pt/floater_html.xml  | 12 -----------
 .../newview/skins/default/xui/zh/floater_html.xml  | 12 -----------
 10 files changed, 9 insertions(+), 127 deletions(-)
 delete mode 100644 linden/indra/newview/skins/default/xui/de/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/es/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/fr/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/ja/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/ko/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/pt/floater_html.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/zh/floater_html.xml

(limited to 'linden/indra/newview/skins/default/xui')

diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
deleted file mode 100644
index 5d5877e..0000000
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="Schließen" name="close_btn" />
-	<button label="Zurück" name="back_btn" />
-	<button label="Zuhause" name="home_btn" />
-	<button label="Weiterleiten" 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
deleted file mode 100644
index d107454..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="500" min_height="300" min_width="400" name="htmlfloater" title=""
-     width="700">
-	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
-	     label="Close" name="close_btn" right="-10" width="80" />
-	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-	     name="html_floater_browser" right="-15" top="-56" />
-	<button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-	     left="15" name="back_btn" width="70" />
-	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Forward" left_delta="73" name="forward_btn" width="70" />
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-	     follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85" 
-	     max_length="256" mouse_opaque="true" name="url_edit" 
-	     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 077ab23..318f46a 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
@@ -8,15 +8,15 @@
 			<button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
 			     width="55" />
 			<button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
-			     name="forward" width="60" />
+			     name="forward" width="68" />
 			<button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-			     left_delta="65" name="reload" width="70" />
+			     left_delta="70" name="reload" width="70" />
 			<combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-			     left_delta="75" max_chars="235" name="address" width="225" />
+			     left_delta="75" max_chars="235" name="address" width="230" />
 			<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-			     left_delta="230" name="go" width="55" />
+			     left_delta="232" name="go" width="55" />
 			<button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
-			     left_delta="60" name="home" width="55" />
+			     left_delta="58" name="home" width="55" />
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" height="20" left="0"
 		     name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,10 +30,10 @@
 			<button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
 			     left="0" name="open_browser" width="185" />
 			<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
-			     label="Always open in my web browser" left_delta="190" name="open_always"
+			     label="Always open in my web browser" left_delta="184" name="open_always"
 			     width="200" />
-			<button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
-			     left="-265" name="set_home" width="155" />
+			<button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home"
+			     left="-176" name="set_home" width="104" />
 			<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
 			     name="close" width="70" />
 		</layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index ecacc78..5808e71 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -178,6 +178,7 @@
 
   <!-- System messages -->
   <string name="landmark_created">You created a landmark at</string>
+  <string name="new_home_page">Your new Home Page is</string>
 
 </strings>
 
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
deleted file mode 100644
index 9985276..0000000
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="Volver" name="back_btn" />
-	<button label="Avanzar" name="forward_btn" />
-	<button label="Recargar" name="reload_btn" />
-	<button label="Parar" name="stop_btn" />
-	<button label="Casa" name="home_btn" />
-	<button label="Ir" name="go_btn" />
-	<string name="support_page_url">
-	  	http://secondlife.com/app/support/index_es.html
-	</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
deleted file mode 100644
index 9504040..0000000
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="Fermer" name="close_btn" />
-	<button label="Précédente" name="back_btn" />
-	<button label="Suivante" name="forward_btn" />
-	<button label="Recharger" name="reload_btn" />
-	<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/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
deleted file mode 100644
index da63fab..0000000
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="閉じる" name="close_btn" />
-	<button label="戻る" name="back_btn" />
-	<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://help.secondlife.com/jp
-	</string>	
-</floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_html.xml b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
deleted file mode 100644
index c4c2055..0000000
--- a/linden/indra/newview/skins/default/xui/ko/floater_html.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="닫기" name="close_btn" />
-	<button label="뒤로" name="back_btn" />
-	<button label="홈" name="home_btn" />
-	<button label="앞으로" name="forward_btn" />
-	<button label="이동" name="go_btn" />
-	<string name="home_page_url">
-		http://kr.secondlife.com
-	</string>
-	<string name="support_page_url">
-	  	http://help.secondlife.com/kr
-	</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
deleted file mode 100644
index b64cb2d..0000000
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<text name="f1_help_title">
-		Second Life Help
-	</text>
-	<text name="f1_help_url">
-		http://secondlife.com/app/support/index_pt.html
-	</text>
-	<string name="support_page_url">
-	  	http://secondlife.com/app/support/index_pt.html
-	</string>
-</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
deleted file mode 100644
index 8c75fa7..0000000
--- a/linden/indra/newview/skins/default/xui/zh/floater_html.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
-	<button label="返回" name="back_btn" />
-	<button label="朝向" name="forward_btn" />
-	<button label="重载入" name="reload_btn" />
-	<button label="停止" name="stop_btn" />
-	<button label="家" name="home_btn" />
-	<button label="行动" name="go_btn" />
-	<string name="support_page_url">
-	  	http://secondlife.com/app/support/index_zh.html
-	</string>
-</floater>
-- 
cgit v1.1