From 24acb7d5c3b6c3af4d7d814b8ccb0b9652eb38d3 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 3 May 2019 14:58:51 -0700
Subject: Fix some line-endings to be newline only.

---
 indra/newview/llfloatermyenvironment.cpp           | 16 ++++++------
 .../default/xui/en/floater_my_environments.xml     | 30 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index af71329607..1d2f14532d 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -162,14 +162,14 @@ void LLFloaterMyEnvironment::onOpen(const LLSD& key)
 }
 
 //-------------------------------------------------------------------------
-void LLFloaterMyEnvironment::onShowFoldersChange()
-{
-    bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
-
-    mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
-
-    if (mInventoryList)
-        mInventoryList->setShowFolderState(mShowFolders);
+void LLFloaterMyEnvironment::onShowFoldersChange()
+{
+    bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
+
+    mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
+
+    if (mInventoryList)
+        mInventoryList->setShowFolderState(mShowFolders);
 }
 
 void LLFloaterMyEnvironment::onFilterCheckChange()
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 46894ded80..6aff387dcb 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -124,21 +124,21 @@
         </layout_panel>
         <layout_panel
                 auto_resize="false"
-                user_resize="false"
-                tab_group="1"
-                height="15">
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show All Folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="2"
-                    left_delta="-1"
-                    width="200" />
-        </layout_panel>
-        <layout_panel
+                user_resize="false"
+                tab_group="1"
+                height="15">
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show All Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="2"
+                    left_delta="-1"
+                    width="200" />
+        </layout_panel>
+        <layout_panel
                 auto_resize="false"
                 tab_group="1"
                 height="31"
-- 
cgit v1.2.3