fix for Windows line endings - converted to Unix style

2 files changed, 479 insertions, 479 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 4893eeafb1..a258a874b0 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -1,214 +1,214 @@
-<panel

-  follows="all"

-  height="768"

-  layout="topleft"

-  name="panel_login"

-  focus_root="true"

-  background_visible="true"

-  bg_opaque_color="0.16 0.16 0.16 1"

-  background_opaque="true"

-  width="1024">

-  <panel.string

-    name="forgot_password_url">

-    http://secondlife.com/account/request.php

-  </panel.string>

-  <layout_stack

-  follows="left|right|top"

-  height="172"

-  min_height="172"

-  left="0"

-  name="ui_stack"

-  orientation="horizontal"

-  top="0"

-  width="1024">

-    <layout_panel

-      height="172"

-      auto_resize="true"

-      name="ui_elastic_pad_left"

-      width="32" />

-    <layout_panel

-      auto_resize="false"

-      follows="left|right|top"

-      name="ui_container"

-      width="960"

-      left="0"

-      top="0"

-      height="172">

-  <icon

-    height="73"

-    width="165"

-    image_name="login_sl_logo"

-    left="0"

-    top="25"

-    name="sl_logo_small" />

-  <combo_box

-    left_pad="22"

-    bottom_delta="-7"

-    allow_text_entry="true"

-    follows="left|top"

-    height="32"

-    label="Username"

-    combo_editor.font="SansSerifLarge"

-    max_chars="128"

-    commit_on_focus_lost="false"

-    combo_editor.prevalidate_callback="ascii"

-    tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"

-    name="username_combo"

-    width="232">

-    <combo_box.combo_editor

-      text_pad_left="8" />

-    <combo_box.combo_button

-      visible="false" />

-    <combo_box.drop_down_button

-      visible="false" />

-  </combo_box>

-  <line_editor

-    follows="left|top"

-    height="32"

-    left_pad="0"

-    max_length_bytes="16"

-    text_pad_left="8"

-    name="password_edit"

-    label="Password"

-    font="SansSerifLarge"

-    is_password="true"

-    select_on_focus="true"

-    commit_on_focus_lost="false"

-    bottom_delta="0"

-    width="200" />

-  <check_box

-    control_name="RememberPassword"

-    follows="left|top"

-    font="SansSerifMedium"

-    left_pad="20"

-    bottom_delta="-14"

-    height="24"

-    label="Remember me"

-    check_button.bottom="3"

-    name="remember_check"

-    width="145" />

-  <text

-    follows="left|top"

-    font="SansSerifMedium"

-    text_color="EmphasisColor"

-    height="16"

-    name="forgot_password_text"

-    left_delta="0"

-    bottom_delta="16"

-    width="200">

-    Forgotten password

-  </text>

-  <button

-    follows="left|top"

-    image_unselected="PushButton_Login"

-    image_pressed="PushButton_Login_Pressed"

-    image_hover="PushButton_Login_Over"

-    label="Log In"

-    label_color="White"

-    font="SansSerifMedium"

-    name="connect_btn"

-    enabled="true"

-    left="0"

-    width="80"

-    height="26"

-    bottom_delta="44" />

-  <text

-    follows="left|top"

-    font="SansSerifLarge"

-    height="24"

-    name="At_My_Last_Location_Label"

-    left_pad="8"

-    bottom_delta="1"

-    width="120">

-    at last location

-  </text>

-  <combo_box

-    control_name="NextLoginLocation"

-    follows="left|top"

-    label="My favorite places"

-    height="26"

-    max_chars="128"

-    combo_editor.font="SansSerifMedium"

-    left_pad="20"

-    bottom_delta="0"

-    name="start_location_combo"

-    width="175"

-    combo_button.scale_image="true">

-    <combo_box.item

-      label="My home"

-      name="MyHome"

-      value="home" />

-  </combo_box>

-  <button

-    follows="left|top"

-    image_unselected="PushButton_Login"

-    image_pressed="PushButton_Login_Pressed"

-    image_hover="PushButton_Login_Over"

-    label="Log In"

-    label_color="White"

-    font="SansSerifMedium"

-    name="connect_favorite_btn"

-    left_pad="8"

-    width="80"

-    enabled="false"

-    height="26"

-    bottom_delta="0" />

-  <line_editor

-    follows="left|top"

-    width="170"

-    height="26"

-    left_pad="40"

-    text_pad_left="8"

-    name="location_edit"

-    label="Type a location"

-    font="SansSerifMedium"

-    select_on_focus="true"

-    commit_on_focus_lost="false"

-    bottom_delta="0" />

-  <button

-    follows="left|top"

-    image_unselected="PushButton_Login"

-    image_pressed="PushButton_Login_Pressed"

-    image_hover="PushButton_Login_Over"

-    label="Log In"

-    enabled="false"

-    label_color="White"

-    font="SansSerifMedium"

-    name="connect_location_btn"

-    left_pad="8"

-    width="80"

-    height="26"

-    bottom_delta="0" />

-  <combo_box

-    allow_text_entry="false"

-    font="SansSerifTiny"

-    follows="left|top"

-    height="26"

-    max_chars="128"

-    label="Select grid"

-    left_pad="40"

-    bottom_delta="0"

-    layout="topleft"

-    top_pad="2"

-    name="server_combo"

-    width="128" />

-    </layout_panel>

-    <layout_panel

-      height="172"

-      auto_resize="true"

-      name="ui_elastic_pad_right"

-      width="32" />

-  </layout_stack>

-  <web_browser

-    tab_stop="false"

-    trusted_content="true"

-    bg_opaque_color="Black"

-    border_visible="false"

-    follows="all"

-    left="0"

-    name="login_html"

-    start_url=""

-    top="154"

-    height="600"

-    width="1024" />

-</panel>

+<panel
+  follows="all"
+  height="768"
+  layout="topleft"
+  name="panel_login"
+  focus_root="true"
+  background_visible="true"
+  bg_opaque_color="0.16 0.16 0.16 1"
+  background_opaque="true"
+  width="1024">
+  <panel.string
+    name="forgot_password_url">
+    http://secondlife.com/account/request.php
+  </panel.string>
+  <layout_stack
+  follows="left|right|top"
+  height="172"
+  min_height="172"
+  left="0"
+  name="ui_stack"
+  orientation="horizontal"
+  top="0"
+  width="1024">
+    <layout_panel
+      height="172"
+      auto_resize="true"
+      name="ui_elastic_pad_left"
+      width="32" />
+    <layout_panel
+      auto_resize="false"
+      follows="left|right|top"
+      name="ui_container"
+      width="960"
+      left="0"
+      top="0"
+      height="172">
+  <icon
+    height="73"
+    width="165"
+    image_name="login_sl_logo"
+    left="0"
+    top="25"
+    name="sl_logo_small" />
+  <combo_box
+    left_pad="22"
+    bottom_delta="-7"
+    allow_text_entry="true"
+    follows="left|top"
+    height="32"
+    label="Username"
+    combo_editor.font="SansSerifLarge"
+    max_chars="128"
+    commit_on_focus_lost="false"
+    combo_editor.prevalidate_callback="ascii"
+    tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+    name="username_combo"
+    width="232">
+    <combo_box.combo_editor
+      text_pad_left="8" />
+    <combo_box.combo_button
+      visible="false" />
+    <combo_box.drop_down_button
+      visible="false" />
+  </combo_box>
+  <line_editor
+    follows="left|top"
+    height="32"
+    left_pad="0"
+    max_length_bytes="16"
+    text_pad_left="8"
+    name="password_edit"
+    label="Password"
+    font="SansSerifLarge"
+    is_password="true"
+    select_on_focus="true"
+    commit_on_focus_lost="false"
+    bottom_delta="0"
+    width="200" />
+  <check_box
+    control_name="RememberPassword"
+    follows="left|top"
+    font="SansSerifMedium"
+    left_pad="20"
+    bottom_delta="-14"
+    height="24"
+    label="Remember me"
+    check_button.bottom="3"
+    name="remember_check"
+    width="145" />
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+    height="16"
+    name="forgot_password_text"
+    left_delta="0"
+    bottom_delta="16"
+    width="200">
+    Forgotten password
+  </text>
+  <button
+    follows="left|top"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
+    label="Log In"
+    label_color="White"
+    font="SansSerifMedium"
+    name="connect_btn"
+    enabled="true"
+    left="0"
+    width="80"
+    height="26"
+    bottom_delta="44" />
+  <text
+    follows="left|top"
+    font="SansSerifLarge"
+    height="24"
+    name="At_My_Last_Location_Label"
+    left_pad="8"
+    bottom_delta="1"
+    width="120">
+    at last location
+  </text>
+  <combo_box
+    control_name="NextLoginLocation"
+    follows="left|top"
+    label="My favorite places"
+    height="26"
+    max_chars="128"
+    combo_editor.font="SansSerifMedium"
+    left_pad="20"
+    bottom_delta="0"
+    name="start_location_combo"
+    width="175"
+    combo_button.scale_image="true">
+    <combo_box.item
+      label="My home"
+      name="MyHome"
+      value="home" />
+  </combo_box>
+  <button
+    follows="left|top"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
+    label="Log In"
+    label_color="White"
+    font="SansSerifMedium"
+    name="connect_favorite_btn"
+    left_pad="8"
+    width="80"
+    enabled="false"
+    height="26"
+    bottom_delta="0" />
+  <line_editor
+    follows="left|top"
+    width="170"
+    height="26"
+    left_pad="40"
+    text_pad_left="8"
+    name="location_edit"
+    label="Type a location"
+    font="SansSerifMedium"
+    select_on_focus="true"
+    commit_on_focus_lost="false"
+    bottom_delta="0" />
+  <button
+    follows="left|top"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
+    label="Log In"
+    enabled="false"
+    label_color="White"
+    font="SansSerifMedium"
+    name="connect_location_btn"
+    left_pad="8"
+    width="80"
+    height="26"
+    bottom_delta="0" />
+  <combo_box
+    allow_text_entry="false"
+    font="SansSerifTiny"
+    follows="left|top"
+    height="26"
+    max_chars="128"
+    label="Select grid"
+    left_pad="40"
+    bottom_delta="0"
+    layout="topleft"
+    top_pad="2"
+    name="server_combo"
+    width="128" />
+    </layout_panel>
+    <layout_panel
+      height="172"
+      auto_resize="true"
+      name="ui_elastic_pad_right"
+      width="32" />
+  </layout_stack>
+  <web_browser
+    tab_stop="false"
+    trusted_content="true"
+    bg_opaque_color="Black"
+    border_visible="false"
+    follows="all"
+    left="0"
+    name="login_html"
+    start_url=""
+    top="154"
+    height="600"
+    width="1024" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 994e6e63da..84753c55a3 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -1,265 +1,265 @@
-<panel

-  follows="all"

-  height="768"

-  layout="topleft"

-  name="panel_login"

-  focus_root="true"

-  background_visible="true"

-  bg_opaque_color="0.16 0.16 0.16 1"

-  background_opaque="true"

-  width="1024">

-  <panel.string

-    name="forgot_password_url">

-    http://secondlife.com/account/request.php

-  </panel.string>

-  <layout_stack

-    follows="left|right|top|bottom"

-    width="1024"

-    height="768"

-    left="0"

-    name="logo_stack"

-    orientation="vertical"

-    top="0">

-    <layout_panel

-      height="18"

-      auto_resize="false"

-      name="page_top"

-      width="1024" />

-    <!-- start of logo stack -->

-    <layout_panel

-      height="130"

-      min_height="10"

-      auto_resize="false"

-      name="parent_panel"

-      width="1024">

-      <layout_stack

-        follows="left|right|top|bottom"

-        height="100"

-        left="0"

-        name="logo_stack"

-        orientation="horizontal"

-        top="0"

-        width="1024">

-        <layout_panel

-          height="110"

-          min_height="10"

-          auto_resize="true"

-          name="logo_left"

-          width="300" />

-        <layout_panel

-          auto_resize="false"

-          follows="left|right|top"

-          name="logo_container"

-          width="225"

-          left="0"

-          top="0"

-          height="105">

-          <icon

-            height="94"

-            image_name="login_sl_logo"

-            left="0"

-            name="sl_logo"

-            top="0" />

-        </layout_panel>

-        <layout_panel

-          height="100"

-          name="logo_right"

-          auto_resize="true"

-          width="300" />

-      </layout_stack>

-    </layout_panel>

-    <!-- end of logo stack -->

-    <!-- start of widget stack -->

-    <layout_panel

-      height="100"

-      min_height="10"

-      auto_resize="false"

-      name="parent_panel2"

-      width="1024">

-      <layout_stack

-        follows="left|right|top|bottom"

-        height="80"

-        left="0"

-        name="widget_stack"

-        orientation="horizontal"

-        top="0"

-        width="1024">

-        <layout_panel

-          height="80"

-          min_height="10"

-          auto_resize="true"

-          name="widget_left"

-          width="200" />

-        <layout_panel

-          auto_resize="false"

-          follows="left|right|top"

-          name="widget_container"

-          width="532"

-          left="0"

-          top="0"

-          height="80">

-          <combo_box

-            allow_text_entry="true"

-            follows="left|bottom"

-            height="32"

-            left="0"

-            label="Username"

-            combo_editor.font="SansSerifLarge"

-            max_chars="128"

-            top="0"

-            commit_on_focus_lost="false"

-            combo_editor.prevalidate_callback="ascii"

-            tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"

-            name="username_combo"

-            width="232">

-            <combo_box.combo_editor

-                text_pad_left="8" />

-            <combo_box.combo_button

-                visible ="false"/>

-              <combo_box.drop_down_button

-                visible ="false"/>

-          </combo_box>          

-          <line_editor

-            follows="left|top"

-            width="200"

-            height="32"

-            left="220"

-            max_length_bytes="16"

-            name="password_edit"

-            label="Password"

-            text_pad_left="8"

-            font="SansSerifLarge"

-            is_password="true"

-            select_on_focus="true"

-            commit_on_focus_lost="false"

-            top="0" />

-          <button

-            follows="left|top"

-            image_unselected="PushButton_Login"

-            image_pressed="PushButton_Login_Pressed"

-            image_hover="PushButton_Login_Over"

-            label="Log In"

-            label_color="White"

-            font="SansSerifLarge"

-            name="connect_btn"

-            left="432"

-            width="100"

-            height="32"

-            top="0" />

-          <check_box

-            control_name="RememberPassword"

-            follows="left|top"

-            font="SansSerifLarge"

-            left="0"

-            top="32"

-            height="24"

-            label="Remember me"

-            check_button.bottom="3"

-            name="remember_check"

-            width="145" />

-          <text

-            follows="left|top"

-            font="SansSerifLarge"

-            text_color="EmphasisColor"

-            height="16"

-            name="forgot_password_text"

-            left="216"

-            top="34"

-            width="200">

-            Forgotten password

-          </text>

-        </layout_panel>

-        <layout_panel

-          height="100"

-          name="widget_right"

-          auto_resize="true"

-          width="200" />

-      </layout_stack>

-    </layout_panel>

-    <!-- end of widget stack -->

-    <!-- start of images stack -->

-    <layout_panel

-      height="500"

-      min_height="10"

-      auto_resize="false"

-      name="parent_panel3"

-      width="1024">

-      <layout_stack

-        follows="left|right|top|bottom"

-        height="500"

-        left="0"

-        name="images_stack"

-        orientation="horizontal"

-        top="0"

-        width="1024">

-        <layout_panel

-          height="500"

-          min_height="10"

-          auto_resize="true"

-          name="images_left"

-          width="96" />

-        <layout_panel

-          auto_resize="false"

-          follows="left|right|top"

-          name="images_container"

-          width="832"

-          left="0"

-          top="0"

-          height="500">

-          <icon

-            height="400"

-            width="400"

-            image_name="first_login_image_left"

-            left="0"

-            name="image_left"

-            top="0" />

-          <icon

-            height="400"

-            width="400"

-            image_name="first_login_image_right"

-            left_pad="32"

-            name="image_right"

-            top="0" />

-          <text

-            follows="left|top"

-            font="SansSerifLarge"

-            text_color="White"

-            height="64"

-            name="image_caption_left"

-            left="0"

-            halign="center"

-            top="408"

-            word_wrap="true"

-            width="400">

-            Your first step is Learning Island. Find the exit portal!

-          </text>

-          <text

-            follows="left|top"

-            font="SansSerifLarge"

-            text_color="White"

-            height="64"

-            name="image_caption_right"

-            left="432"

-            halign="center"

-            top="408"

-            word_wrap="true"

-            width="400">

-            Then explore Social Island and meet other new residents!

-          </text>

-        </layout_panel>

-        <layout_panel

-          height="100"

-          name="images_right"

-          auto_resize="true"

-          width="96" />

-      </layout_stack>

-    </layout_panel>

-    <!-- end of images stack -->

-    <layout_panel

-      height="400"

-      min_height="10"

-      auto_resize="true"

-      name="page_bottom"

-      width="1024" />

-  </layout_stack>

-</panel>

+<panel
+  follows="all"
+  height="768"
+  layout="topleft"
+  name="panel_login"
+  focus_root="true"
+  background_visible="true"
+  bg_opaque_color="0.16 0.16 0.16 1"
+  background_opaque="true"
+  width="1024">
+  <panel.string
+    name="forgot_password_url">
+    http://secondlife.com/account/request.php
+  </panel.string>
+  <layout_stack
+    follows="left|right|top|bottom"
+    width="1024"
+    height="768"
+    left="0"
+    name="logo_stack"
+    orientation="vertical"
+    top="0">
+    <layout_panel
+      height="18"
+      auto_resize="false"
+      name="page_top"
+      width="1024" />
+    <!-- start of logo stack -->
+    <layout_panel
+      height="130"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="100"
+        left="0"
+        name="logo_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="110"
+          min_height="10"
+          auto_resize="true"
+          name="logo_left"
+          width="300" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="logo_container"
+          width="225"
+          left="0"
+          top="0"
+          height="105">
+          <icon
+            height="94"
+            image_name="login_sl_logo"
+            left="0"
+            name="sl_logo"
+            top="0" />
+        </layout_panel>
+        <layout_panel
+          height="100"
+          name="logo_right"
+          auto_resize="true"
+          width="300" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of logo stack -->
+    <!-- start of widget stack -->
+    <layout_panel
+      height="100"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel2"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="80"
+        left="0"
+        name="widget_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="80"
+          min_height="10"
+          auto_resize="true"
+          name="widget_left"
+          width="200" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="widget_container"
+          width="532"
+          left="0"
+          top="0"
+          height="80">
+          <combo_box
+            allow_text_entry="true"
+            follows="left|bottom"
+            height="32"
+            left="0"
+            label="Username"
+            combo_editor.font="SansSerifLarge"
+            max_chars="128"
+            top="0"
+            commit_on_focus_lost="false"
+            combo_editor.prevalidate_callback="ascii"
+            tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+            name="username_combo"
+            width="232">
+            <combo_box.combo_editor
+                text_pad_left="8" />
+            <combo_box.combo_button
+                visible ="false"/>
+              <combo_box.drop_down_button
+                visible ="false"/>
+          </combo_box>
+          <line_editor
+            follows="left|top"
+            width="200"
+            height="32"
+            left="220"
+            max_length_bytes="16"
+            name="password_edit"
+            label="Password"
+            text_pad_left="8"
+            font="SansSerifLarge"
+            is_password="true"
+            select_on_focus="true"
+            commit_on_focus_lost="false"
+            top="0" />
+          <button
+            follows="left|top"
+            image_unselected="PushButton_Login"
+            image_pressed="PushButton_Login_Pressed"
+            image_hover="PushButton_Login_Over"
+            label="Log In"
+            label_color="White"
+            font="SansSerifLarge"
+            name="connect_btn"
+            left="432"
+            width="100"
+            height="32"
+            top="0" />
+          <check_box
+            control_name="RememberPassword"
+            follows="left|top"
+            font="SansSerifLarge"
+            left="0"
+            top="32"
+            height="24"
+            label="Remember me"
+            check_button.bottom="3"
+            name="remember_check"
+            width="145" />
+          <text
+            follows="left|top"
+            font="SansSerifLarge"
+            text_color="EmphasisColor"
+            height="16"
+            name="forgot_password_text"
+            left="216"
+            top="34"
+            width="200">
+            Forgotten password
+          </text>
+        </layout_panel>
+        <layout_panel
+          height="100"
+          name="widget_right"
+          auto_resize="true"
+          width="200" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of widget stack -->
+    <!-- start of images stack -->
+    <layout_panel
+      height="500"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel3"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="500"
+        left="0"
+        name="images_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="500"
+          min_height="10"
+          auto_resize="true"
+          name="images_left"
+          width="96" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="images_container"
+          width="832"
+          left="0"
+          top="0"
+          height="500">
+          <icon
+            height="400"
+            width="400"
+            image_name="first_login_image_left"
+            left="0"
+            name="image_left"
+            top="0" />
+          <icon
+            height="400"
+            width="400"
+            image_name="first_login_image_right"
+            left_pad="32"
+            name="image_right"
+            top="0" />
+          <text
+            follows="left|top"
+            font="SansSerifLarge"
+            text_color="White"
+            height="64"
+            name="image_caption_left"
+            left="0"
+            halign="center"
+            top="408"
+            word_wrap="true"
+            width="400">
+            Your first step is Learning Island. Find the exit portal!
+          </text>
+          <text
+            follows="left|top"
+            font="SansSerifLarge"
+            text_color="White"
+            height="64"
+            name="image_caption_right"
+            left="432"
+            halign="center"
+            top="408"
+            word_wrap="true"
+            width="400">
+            Then explore Social Island and meet other new residents!
+          </text>
+        </layout_panel>
+        <layout_panel
+          height="100"
+          name="images_right"
+          auto_resize="true"
+          width="96" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of images stack -->
+    <layout_panel
+      height="400"
+      min_height="10"
+      auto_resize="true"
+      name="page_bottom"
+      width="1024" />
+  </layout_stack>
+</panel>