Second Life viewer sources 1.19.1.3

24 files changed, 92 insertions, 161 deletions

diff --git a/linden/indra/newview/skins/xui/de/alerts.xml b/linden/indra/newview/skins/xui/de/alerts.xml
index d3fd64f..7414cc6 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/xui/de/alerts.xml
@@ -530,7 +530,7 @@ Objekte: [N]
         <alert name="ReturnObjectsOwnedByUser">
                 <message name="message">
                         Möchten Sie alle Objekte auf dieser Parzelle,
-die NICHT dem Einwohner &apos;[NAME]&apos; gehören,
+die dem Einwohner &apos;[NAME]&apos; gehören,
 in das jeweilige Inventar ihrer Eigentümer transferieren?
  
 Objekte: [N]
diff --git a/linden/indra/newview/skins/xui/de/floater_html.xml b/linden/indra/newview/skins/xui/de/floater_html.xml
index 1b37b52..f5c69ce 100644
--- a/linden/indra/newview/skins/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/xui/de/floater_html.xml
@@ -5,11 +5,4 @@
         <button label="Zuhause" name="home_btn" />
         <button label="Weiterleiten" name="forward_btn" />
         <button label="Los" name="go_btn" />
-        <text name="home_page_url">
-                http://www.secondlife.com
-        </text>
-        <text hidden="true" name="f1_help_title">Second Life Help</text>
-        <text hidden="true" name="f1_help_url">
-                http://secondlife.com/app/support/index_de.html
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/panel_login.xml b/linden/indra/newview/skins/xui/de/panel_login.xml
index c2f78aa..c3d3d1b 100644
--- a/linden/indra/newview/skins/xui/de/panel_login.xml
+++ b/linden/indra/newview/skins/xui/de/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-        <text name="real_url">
-                http://secondlife.com/app/login/
-        </text>
         <text name="first_name_text">
                 Vorname:
         </text>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
index ee401b0..802eb0f 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
@@ -14,7 +14,7 @@
         <text type="string" length="1" name="(width / height)">
                 (Breite/Höhe)
         </text>
-        <text_editor name="FullScreenInfo">
+        <text_editor name="FullScreenInfo" width="480">
                 Wenn deaktiviert, schaltet die Anzeige bei Anmeldung auf Vollbild um.
         </text_editor>
         <text name="DisplayResLabel">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index a0cb0dd..8b21736 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -670,7 +670,7 @@
                              height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
                              name="set_media_url" left="80" scale_image="true" width="60" />
                         <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="with media:" width="65">
+                             left="10" mouse_opaque="true" name="with media:" width="67">
                                 Media Type:
                         </text>
                         <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
@@ -778,7 +778,7 @@ Options:
                         </text>
                         <radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"
                              height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"
-                             tab_stop="true" width="219">
+                             tab_stop="true" width="363">
                                 <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
                                      mouse_opaque="true" name="Estate" width="463">
                                         Use the Estate spatial channel
diff --git a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
index 0622fe8..c1a4261 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
@@ -25,63 +25,63 @@
                              bottom="-80" control_name="WL12am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left="8" mouse_opaque="true" name="WL12am"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 12am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3am"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 3am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6am"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 6am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true"
-                             name="WL9amHash" v_pad="0" width="35">
+                             name="WL9amHash" v_pad="0" width="55">
                                 9am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true"
-                             name="WL12pmHash" v_pad="0" width="35">
+                             name="WL12pmHash" v_pad="0" width="55">
                                 12pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3pm"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 3pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6pm"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 6pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL9pm"
-                             v_pad="0" width="35">
+                             v_pad="0" width="55">
                                 9pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
                              height="6" hidden="false" left_delta="65" mouse_opaque="true"
-                             name="WL12am2" v_pad="0" width="35">
+                             name="WL12am2" v_pad="0" width="55">
                                 12am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
@@ -157,7 +157,7 @@
                              bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
                              height="16" hidden="false" left="20" mouse_opaque="true"
-                             name="WLCurKeyFrameText" v_pad="0" width="110">
+                             name="WLCurKeyFrameText" v_pad="0" width="150">
                                 Key Frame Settings:
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
@@ -229,22 +229,22 @@
                         </text>
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
                              hidden="false" label="Play" label_selected="Play" left="310"
-                             mouse_opaque="true" name="WLAnimSky" scale_image="true" width="40" />
+                             mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" />
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Stop!" label_selected="Stop" left_delta="45"
-                             mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="40" />
+                             hidden="false" label="Stop!" label_selected="Stop" left_delta="55"
+                             mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" />
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
                              hidden="false" label="Use Estate Time" label_selected="Go to Estate Time"
-                             left_delta="45" mouse_opaque="true" name="WLUseLindenTime"
-                             scale_image="true" width="120" />
-                        <button bottom="-170" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Save Test Day" label_selected="Save Test Day"
-                             left="530" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
-                             width="100" />
+                             left_delta="55" mouse_opaque="true" name="WLUseLindenTime"
+                             scale_image="true" width="140" />
                         <button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
+                             hidden="false" label="Save Test Day" label_selected="Save Test Day"
+                             left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
+                             width="150" />
+                        <button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20"
                              hidden="false" label="Load Test Day" label_selected="Load Test Day"
-                             left="530" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
-                             width="100" />
+                             left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
+                             width="150" />
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 3dfbdb1..6edeec2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -19,10 +19,4 @@
         <string name="home_page_url">
                 http://www.secondlife.com
         </string>
-        <string name="f1_help_title">
-                Second Life Help
-        </string>
-        <string name="f1_help_url">
-                http://secondlife.com/app/support/
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index 20efaae..66a6768 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -35,11 +35,11 @@
              name="profile_callee_btn" width="80" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="85" name="start_call_btn" width="80" />
+             label="Call" left_delta="85" name="start_call_btn" width="90" />
         <button bottom="-40" follows="left|top" halign="right" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
-             visible="false" width="80" />
+             visible="false" width="90" />
         <panel border="false" bottom="-40" follows="left|top|right" height="20"
              left_delta="77" name="speaker_controls" width="344">
                 <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
index 1a793e8..5b2d310 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
@@ -1,34 +1,34 @@
 <?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="440" min_height="140" min_width="432" name="floater_about"
-     rect_control="FloaterMediaRect" title="Media Browser" width="535">
-        <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="515">
+     height="440" min_height="140" min_width="467" name="floater_about"
+     rect_control="FloaterMediaRect" title="Media Browser" width="560">
+        <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
-                     width="515">
+                     width="540">
                         <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
-                             width="50" />
+                             width="55" />
                         <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
                              name="forward" width="60" />
                         <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-                             left_delta="65" name="reload" width="60" />
+                             left_delta="65" name="reload" width="70" />
                         <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="65" max_chars="255" name="address" width="295" />
+                             left_delta="75" max_chars="255" name="address" width="280" />
                         <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="300" name="go" width="30" />
+                             left_delta="285" name="go" width="55" />
                 </layout_panel>
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
-                     name="parcel_owner_controls" user_resize="false" width="515">
+                     name="parcel_owner_controls" user_resize="false" width="540">
                         <button bottom="0" enabled="false" follows="left|top" height="20"
                              label="Send Current URL to Parcel" left="0" name="assign" width="200" />
                 </layout_panel>
                 <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
-                     width="515">
+                     width="540">
                         <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
-                             width="515" />
+                             width="540" />
                         <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
-                             left="0" name="open_browser" width="150" />
+                             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="155" name="open_always"
+                             label="Always open in my web browser" left_delta="190" name="open_always"
                              width="200" />
                         <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
                              name="close" width="70" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_water.xml b/linden/indra/newview/skins/xui/en-us/floater_water.xml
index 9182c17..bd63105 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_water.xml
@@ -16,13 +16,13 @@
              name="WaterPresetsCombo" width="150" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
              hidden="false" label="New" label_selected="New" left_delta="170"
-             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="50" />
+             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="60"
-             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="50" />
+             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="60"
-             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="50" />
+             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
         <tab_container bottom="-240" follows="left|top" height="180" hidden="false" left="0"
              mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
@@ -35,7 +35,7 @@
                                 Water Fog Color
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="105" name="WaterFogColorHelp" width="18" />
+                             left="160" name="WaterFogColorHelp" width="18" />
                         <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
                              can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
                              height="50" hidden="false" label="" left="40" mouse_opaque="true"
@@ -47,7 +47,7 @@
                                 Fog Density Exponent
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="135" name="WaterFogDensityHelp" width="18" />
+                             left="160" name="WaterFogDensityHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
                              decimal_digits="1" follows="left" height="10" increment=".1"
                              initial_val="16" label="" left="24" max_val="10" min_val="0"
@@ -61,7 +61,7 @@
                                 Underwater Fog Modifier
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="155" name="WaterUnderWaterFogModHelp" width="18" />
+                             left="160" name="WaterUnderWaterFogModHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
                              follows="left" height="10" increment=".01" initial_val="16" label=""
                              left="24" max_val="2" min_val="0" mouse_opaque="true"
@@ -73,7 +73,7 @@
                                 Reflection Wavelet Scale
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="391" name="WaterNormalScaleHelp" width="18" />
+                             left="395" name="WaterNormalScaleHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -114,7 +114,7 @@
                                 Fresnel Scale
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="325" name="WaterFresnelScaleHelp" width="18" />
+                             left="395" name="WaterFresnelScaleHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.7" label="" left="259" max_val="1" min_val="0"
@@ -128,7 +128,7 @@
                                 Fresnel Offset
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="330" name="WaterFresnelOffsetHelp" width="18" />
+                             left="395" name="WaterFresnelOffsetHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.7" label="" left="259" max_val="1" min_val="0"
@@ -141,7 +141,7 @@
                                 Refract Scale Above
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="598" name="WaterScaleAboveHelp" width="18" />
+                             left="630" name="WaterScaleAboveHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.1" label="" left="494" max_val="1" min_val="0"
@@ -155,7 +155,7 @@
                                 Refract Scale Below
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="598" name="WaterScaleBelowHelp" width="18" />
+                             left="630" name="WaterScaleBelowHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0" label="" left="494" max_val="1" min_val="0"
@@ -168,7 +168,7 @@
                                 Blur Multiplier
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="565" name="WaterBlurMultiplierHelp" width="18" />
+                             left="630" name="WaterBlurMultiplierHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
                              decimal_digits="3" follows="left" height="10" increment=".001"
                              initial_val="0" label="" left="494" max_val=".16" min_val="0"
@@ -185,7 +185,7 @@
                                 Big Wave Direction
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="120" name="WaterWave1Help" width="18" />
+                             left="155" name="WaterWave1Help" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -217,7 +217,7 @@
                                 Little Wave Direction
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="130" name="WaterWave2Help" width="18" />
+                             left="155" name="WaterWave2Help" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -249,7 +249,7 @@
                                 Normal Map
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="315" name="WaterNormalMapHelp" width="18" />
+                             left="365" name="WaterNormalMapHelp" width="18" />
                         <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
                              width="128" />
                 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
index 30ca821..ff51de0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
@@ -16,16 +16,16 @@
              width="150" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
              hidden="false" label="New" label_selected="New" left_delta="170"
-             mouse_opaque="true" name="WLNewPreset" scale_image="true" width="50" />
+             mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="60"
-             mouse_opaque="true" name="WLSavePreset" scale_image="true" width="50" />
+             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="60"
-             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="50" />
+             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              hidden="false" label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="160" mouse_opaque="true" name="WLDayCycleMenuButton"
+             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
              scale_image="true" width="120" />
         <tab_container bottom="-220" follows="left|top" height="160" hidden="false" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
@@ -39,7 +39,7 @@
                                 Blue Horizon
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="85" name="WLBlueHorizonHelp" width="18" />
+                             left="160" name="WLBlueHorizonHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -91,7 +91,7 @@
                                 Haze Horizon
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="87" name="WLHazeHorizonHelp" width="18" />
+                             left="160" name="WLHazeHorizonHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
@@ -104,7 +104,7 @@
                                 Blue Density
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="320" name="WLBlueDensityHelp" width="18" />
+                             left="395" name="WLBlueDensityHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -156,7 +156,7 @@
                                 Haze Density
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="325" name="WLHazeDensityHelp" width="18" />
+                             left="395" name="WLHazeDensityHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.7" label="" left="259" max_val="4" min_val="0"
@@ -169,7 +169,7 @@
                                 Density Multiplier
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="582" name="WLDensityMultHelp" width="18" />
+                             left="630" name="WLDensityMultHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
@@ -183,7 +183,7 @@
                                 Distance Multiplier
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="589" name="WLDistanceMultHelp" width="18" />
+                             left="630" name="WLDistanceMultHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
                              decimal_digits="1" follows="left" height="10" increment="0.1"
                              initial_val="1.0" label="" left="494" max_val="100" min_val="0"
@@ -196,7 +196,7 @@
                                 Max Altitude
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="555" name="WLMaxAltitudeHelp" width="18" />
+                             left="630" name="WLMaxAltitudeHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
                              decimal_digits="0" follows="left" height="10" increment="1"
                              initial_val="500" label="" left="494" max_val="4000" min_val="0"
@@ -213,7 +213,7 @@
                                 Sun/Moon Color
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="108" name="WLSunlightColorHelp" width="18" />
+                             left="160" name="WLSunlightColorHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -265,7 +265,7 @@
                                 Sun/Moon Position
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="142" name="WLTimeOfDayHelp" width="18" />
+                             left="160" name="WLTimeOfDayHelp" width="18" />
                         <icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
                              left="30" name="SkyDayCycle" width="148" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
@@ -280,7 +280,7 @@
                                 Ambient
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="294" name="WLAmbientHelp" width="18" />
+                             left="395" name="WLAmbientHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -331,7 +331,7 @@
                                 East Angle
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="307" name="WLEastAngleHelp" width="18" />
+                             left="395" name="WLEastAngleHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.0" label="" left="259" max_val="1" min_val="0"
@@ -344,7 +344,7 @@
                                 Sun Glow
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="540" name="WLSunGlowHelp" width="18" />
+                             left="630" name="WLSunGlowHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
@@ -360,7 +360,7 @@
                                 Scene Gamma
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="564" name="WLSceneGammaHelp" width="18" />
+                             left="630" name="WLSceneGammaHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
                              decimal_digits="2" follows="bottom" height="10" increment="0.01"
                              initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
@@ -372,7 +372,7 @@
                                 Star Brightness
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="570" name="WLStarBrightnessHelp" width="18" />
+                             left="630" name="WLStarBrightnessHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
                              decimal_digits="2" follows="bottom" height="10" increment="0.01"
                              initial_val="0" label="" left="494" max_val="2" min_val="0"
@@ -389,7 +389,7 @@
                                 Cloud Color
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="80" name="WLCloudColorHelp" width="18" />
+                             left="160" name="WLCloudColorHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -442,7 +442,7 @@
                                 Cloud XY/Density
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="110" name="WLCloudDensityHelp" width="18" />
+                             left="160" name="WLCloudDensityHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-103" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -483,7 +483,7 @@
                                 Cloud Coverage
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="335" name="WLCloudCoverageHelp" width="18" />
+                             left="395" name="WLCloudCoverageHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.5" label="" left="259" max_val="1" min_val="0"
@@ -492,12 +492,12 @@
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-55" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
-                             left="240" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
+                             left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
                              width="355">
                                 Cloud Scale
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="310" name="WLCloudScaleHelp" width="18" />
+                             left="395" name="WLCloudScaleHelp" width="18" />
                         <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
@@ -511,7 +511,7 @@
                                 Cloud Detail (XY/Density)
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="390" name="WLCloudDetailHelp" width="18" />
+                             left="395" name="WLCloudDetailHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-103" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
@@ -553,9 +553,9 @@
                                 Cloud Scroll X
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="558" name="WLCloudScrollXHelp" width="18" />
+                             left="605" name="WLCloudScrollXHelp" width="18" />
                         <check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Lock" left="580" mouse_opaque="true"
+                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
                              name="WLCloudLockX" width="200" />
                         <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
@@ -570,9 +570,9 @@
                                 Cloud Scroll Y
                         </text>
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="558" name="WLCloudScrollYHelp" width="18" />
+                             left="605" name="WLCloudScrollYHelp" width="18" />
                         <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Lock" left="580" mouse_opaque="true"
+                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
                              name="WLCloudLockY" width="200" />
                         <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index 696c404..bca8cf9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -174,9 +174,6 @@
                 <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
                         한국어 (Korean) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Português (Portuguese) - Beta
-                </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
                         Español (Spanish) - Beta
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/es/floater_html.xml b/linden/indra/newview/skins/xui/es/floater_html.xml
index 7d84b59..ab36540 100644
--- a/linden/indra/newview/skins/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/xui/es/floater_html.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="htmlfloater" title="Navegador de internet">

+<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" />

-        <text name="status_text">

-                Texto de progreso va aquí

-        </text>

-        <text hidden="true" name="f1_help_title">Second Life Help</text>

-        <text hidden="true" name="f1_help_url">

-                http://secondlife.com/app/support/index_es.html

-        </text>

 </floater>

diff --git a/linden/indra/newview/skins/xui/es/panel_login.xml b/linden/indra/newview/skins/xui/es/panel_login.xml
index d2e60bd..7b79f2e 100644
--- a/linden/indra/newview/skins/xui/es/panel_login.xml
+++ b/linden/indra/newview/skins/xui/es/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="panel_login">

-        <text name="real_url">

-                http://secondlife.com/app/login/

-        </text>

         <text name="first_name_text">

                 Nombre de pila:

         </text>

diff --git a/linden/indra/newview/skins/xui/fr/floater_html.xml b/linden/indra/newview/skins/xui/fr/floater_html.xml
index ada5fd1..c60d6ca 100644
--- a/linden/indra/newview/skins/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/xui/fr/floater_html.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="htmlfloater" title="Navigateur">

+<floater name="htmlfloater" title="">

         <button label="Retour" name="back_btn" />

         <button label="Avancer" 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" />

-        <text name="status_text">

-                Texte de progression ici

-        </text>

-        <text hidden="true" name="f1_help_title">Second Life Help</text>

-        <text hidden="true" name="f1_help_url">

-                http://secondlife.com/app/support/index_fr.html

-        </text>

 </floater>

diff --git a/linden/indra/newview/skins/xui/fr/panel_login.xml b/linden/indra/newview/skins/xui/fr/panel_login.xml
index c8d237b..6081b4c 100644
--- a/linden/indra/newview/skins/xui/fr/panel_login.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="panel_login">

-        <text name="real_url">

-                http://secondlife.com/app/login/

-        </text>

         <text name="first_name_text">

                 Prénom :

         </text>

diff --git a/linden/indra/newview/skins/xui/ja/floater_html.xml b/linden/indra/newview/skins/xui/ja/floater_html.xml
index bc1078d..1cb5384 100644
--- a/linden/indra/newview/skins/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_html.xml
@@ -5,11 +5,4 @@
         <button label="ホーム" name="home_btn" />
         <button label="進む" name="forward_btn" />
         <button label="移動" name="go_btn" />
-        <text name="home_page_url">
-                http://www.secondlife.com
-        </text>
-        <text hidden="true" name="f1_help_title">Second Life Help</text>
-        <text hidden="true" name="f1_help_url">
-                http://secondlife.com/app/support/index_ja.html
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/xui/ja/panel_login.xml
index 1f6a4d5..df51507 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-        <text name="real_url">
-                http://secondlife.com/app/login/
-        </text>
         <text name="first_name_text">
                 ファーストネーム：
         </text>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
index 0139602..93f4095 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
@@ -14,7 +14,7 @@
         <text type="string" length="1" name="(width / height)">
                 （幅／高さ）
         </text>
-        <text_editor name="FullScreenInfo">
+        <text_editor name="FullScreenInfo" width="480" bottom="-63" height="40">
                 チェックされていない場合は、ログインするとビューワがフルスクリーンで表示されます。
         </text_editor>
         <text name="DisplayResLabel">
diff --git a/linden/indra/newview/skins/xui/ko/floater_html.xml b/linden/indra/newview/skins/xui/ko/floater_html.xml
index 408619d..7974995 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html.xml
@@ -5,11 +5,4 @@
         <button label="홈" name="home_btn" />
         <button label="앞으로" name="forward_btn" />
         <button label="이동" name="go_btn" />
-        <text name="home_page_url">
-                http://www.secondlife.com
-        </text>
-        <text hidden="true" name="f1_help_title">Second Life Help</text>
-        <text hidden="true" name="f1_help_url">
-                http://secondlife.com/app/support/index_ko.html
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/xui/ko/panel_login.xml
index a0a6912..1c66ef2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-        <text name="real_url">
-                http://secondlife.com/app/login/
-        </text>
         <text name="first_name_text">
                 이름:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
index 599c114..4fa81ef 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
@@ -14,7 +14,7 @@
         <text type="string" length="1" name="(width / height)">
                 (폭/높이)
         </text>
-        <text_editor name="FullScreenInfo">
+        <text_editor name="FullScreenInfo" width="480">
                 선택을 해제하면 로그인 시 전체 화면으로 표시됩니다.
         </text_editor>
         <text name="DisplayResLabel">
diff --git a/linden/indra/newview/skins/xui/zh/floater_html.xml b/linden/indra/newview/skins/xui/zh/floater_html.xml
index 4cda56e..0232bdc 100644
--- a/linden/indra/newview/skins/xui/zh/floater_html.xml
+++ b/linden/indra/newview/skins/xui/zh/floater_html.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="网络浏览器">
+<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" />
-        <text name="status_text">
-                过程文本传到这里
-        </text>
-        <text hidden="true" name="f1_help_title">Second Life Help</text>
-        <text hidden="true" name="f1_help_url">
-                http://secondlife.com/app/support/index_zh.html
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/zh/panel_login.xml b/linden/indra/newview/skins/xui/zh/panel_login.xml
index 5e78b00..dc06531 100644
--- a/linden/indra/newview/skins/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_login.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-        <text name="real_url">
-                http://secondlife.com/app/login/
-        </text>
         <text name="first_name_text">
                 姓:
         </text>