From 346082965ac922a90f7c24bd97be807906b6a35f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 7 Jan 2011 11:26:16 -0500
Subject: STORM-826: fix line endings and mixed tabs/spaces

---
 .../skins/default/xui/en/floater_web_content.xml   | 380 ++++++++++-----------
 1 file changed, 190 insertions(+), 190 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 2ad46824c2..d90d0feda9 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  legacy_header_height="18"
-  can_resize="true"
-  height="440"
-  layout="topleft"
-  min_height="140"
-  min_width="467"
-  name="floater_web_content"
-  help_topic="floater_web_content"
-  save_rect="true"
-  auto_tile="true"
-  title=""
-  initial_mime_type="text/html"
-  width="820">
-  <layout_stack
-    bottom="440"
-    follows="left|right|top|bottom"
-    layout="topleft"
-    left="5"
-    name="stack1"
-    orientation="vertical"
-    top="20"
-    width="810">
-    <layout_panel
-      auto_resize="false"
-      default_tab_group="1"
-      height="22"
-      layout="topleft"
-      left="0"
-      min_height="20"
-      name="nav_controls"
-      top="400"
-      user_resize="false"
-      width="800">
-      <button
-        image_overlay="Arrow_Left_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-		    hover_glow_amount="0.15"
-        tool_tip="Navigate back"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="1"
-        name="back"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Back" />
-      </button>
-      <button
-        image_overlay="Arrow_Right_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Navigate forward"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="27"
-        name="forward"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Forward" />
-      </button>
-      <button
-        image_overlay="Stop_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Stop navigation"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="51"
-        name="stop"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Stop" />
-      </button>
-      <button
-        image_overlay="Refresh_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Reload page"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="51"
-        name="reload"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Reload" />
-      </button>
-      <combo_box
-        allow_text_entry="true"
-        follows="left|top|right"
-        tab_group="1"
-        height="22"
-        layout="topleft"
-        left_pad="4"
-        max_chars="1024"
-        name="address"
-        combo_editor.select_on_focus="true"
-        tool_tip="Enter URL here"
-        top_delta="0"
-        width="702">
-        <combo_box.commit_callback
-          function="WebContent.EnterAddress" />
-      </combo_box>
-      <icon
-        name="media_secure_lock_flag"
-        height="16"
-        follows="top|right"
-        image_name="Lock2"
-        layout="topleft"
-        left_delta="656"
-        top_delta="2"
-        visible="false" 
-        tool_tip="Secured Browsing"
-        width="16" />
-      <button
-        image_overlay="ExternalBrowser_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Open current URL in your desktop browser"
-        follows="right|top"
-        enabled="true" 
-        height="22"
-        layout="topleft"
-        name="popexternal"
-        right="800"
-        top_delta="-2"
-        width="22">
-        <button.commit_callback
-          function="WebContent.PopExternal" />
-      </button>
-    </layout_panel>
-    <layout_panel
-      height="40"
-      layout="topleft"
-      left_delta="0"
-      name="external_controls"
-      top_delta="0"
-      user_resize="false"
-      width="540">
-      <web_browser
-        bottom="-22"
-        follows="all"
-        layout="topleft"
-        left="0"
-        name="webbrowser"
-        top="0"/>
-      <text
-        type="string"
-        length="100"
-        follows="bottom|left"
-        height="20"
-        layout="topleft"
-        left_delta="0"
-        name="statusbartext"
-        parse_urls="false"
-        text_color="0.4 0.4 0.4 1" 
-        top_pad="5"
-        width="452"/>
-      <progress_bar
-        color_bar="0.3 1.0 0.3 1"
-        follows="bottom|right"
-        height="16"
-        top_delta="-1"
-        left_pad="24"
-        layout="topleft"
-        name="statusbarprogress"
-        width="64"/>
-    </layout_panel>
-  </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="440"
+  layout="topleft"
+  min_height="140"
+  min_width="467"
+  name="floater_web_content"
+  help_topic="floater_web_content"
+  save_rect="true"
+  auto_tile="true"
+  title=""
+  initial_mime_type="text/html"
+  width="820">
+  <layout_stack
+    bottom="440"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="810">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      user_resize="false"
+      width="800">
+      <button
+        image_overlay="Arrow_Left_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="702">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|right"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="656"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+      <button
+        image_overlay="ExternalBrowser_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        tool_tip="Open current URL in your desktop browser"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="800"
+        top_delta="-2"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      user_resize="false"
+      width="540">
+      <web_browser
+        bottom="-22"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="webbrowser"
+        top="0"/>
+      <text
+        type="string"
+        length="100"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1" 
+        top_pad="5"
+        width="452"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
-- 
cgit v1.2.3